Bump gcc version requirement to 4.8 : upcoming changes run into compiler bugs with older gcc versions

This commit is contained in:
manuelk 2014-09-24 14:47:57 -07:00
parent 99a4b112b7
commit 7ac73157f4
2 changed files with 11 additions and 2 deletions

View File

@ -110,6 +110,13 @@ set(CMAKE_MODULE_PATH
)
#-------------------------------------------------------------------------------
# OpenSubdiv trips bugs in some older gcc versions
if (CMAKE_COMPILER_IS_GNUCC)
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
message(FATAL_ERROR "g++ 4.8 or newer required")
endif()
endif()
# Detect Clang (until a cmake version provides built-in variables)
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_COMPILER_IS_CLANGCC 1)
@ -134,7 +141,7 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set(OSD_COMPILER_FLAGS)
# Disable spurrious warnings in gcc builds and clang
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANGCC OR CMAKE_COMPILER_IS_ICC )
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANGCC OR CMAKE_COMPILER_IS_ICC )
# Turn on all warnings
if(CMAKE_COMPILER_IS_ICC)

View File

@ -110,6 +110,8 @@ else ()
else ()
# (*)NIX
find_package(Threads REQUIRED)
find_package(X11 REQUIRED)
if(NOT X11_Xrandr_FOUND)
@ -124,7 +126,7 @@ else ()
message(FATAL_ERROR "Xcursor library not found - required for GLFW")
endif()
list(APPEND GLFW_x11_LIBRARY "${X11_Xrandr_LIB}" "${X11_Xxf86vm_LIB}" "${X11_Xcursor_LIB}" -lrt)
list(APPEND GLFW_x11_LIBRARY "${X11_Xrandr_LIB}" "${X11_Xxf86vm_LIB}" "${X11_Xcursor_LIB}" "${CMAKE_THREAD_LIBS_INIT}" -lrt -lXi)
find_library( GLFW_glfw_LIBRARY
NAMES