AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2025-01-18 12:10:06 +00:00
Code Issues Releases Wiki Activity

Added build options: NO_GLFW NO_GLFW_X11

Browse Source
This commit is contained in:
David G Yu 2017-07-27 19:18:34 -07:00
parent c6a527b02c
commit 3e640239f7
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -306,6 +306,8 @@ option(NO_METAL "Disable Metal support" OFF)
option(NO_DX "Disable DirectX support") option(NO_DX "Disable DirectX support")
option(NO_TESTS "Disable all tests") option(NO_TESTS "Disable all tests")
option(NO_GLTESTS "Disable GL tests") option(NO_GLTESTS "Disable GL tests")
option(NO_GLFW "Disable components depending on GLFW" OFF)
option(NO_GLFW_X11 "Disable GLFW components depending on X11" OFF)
option(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES "Enable true derivative evaluation for Gregory basis patches" OFF) option(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES "Enable true derivative evaluation for Gregory basis patches" OFF)
@ -335,7 +337,7 @@ endif()
if(NOT NO_CUDA) if(NOT NO_CUDA)
find_package(CUDA 4.0) find_package(CUDA 4.0)
endif() endif()
if(NOT NO_OPENGL AND NOT ANDROID AND NOT IOS) if(NOT NO_GLFW AND NOT NO_OPENGL AND NOT ANDROID AND NOT IOS)
find_package(GLFW 3.0.0) find_package(GLFW 3.0.0)
endif() endif()
if(NOT NO_PTEX) if(NOT NO_PTEX)

61
cmake/FindGLFW.cmake
View File

@ -30,6 +30,19 @@
# GLFW_LIBRARIES # GLFW_LIBRARIES
# #
if(NOT NO_GLFW_X11)
set(GLFW_X11_INCLUDE_DIRS
"/usr/X11R6/include"
"/usr/include/X11"
)
set(GLFW_X11_LIB_DIRS
"/usr/X11R6/lib"
)
else()
set(GLFW_X11_INCLUDE_DIRS "")
set(GLFW_X11_LIB_DIRS "")
endif()
find_path( GLFW_INCLUDE_DIR find_path( GLFW_INCLUDE_DIR
NAMES NAMES
GLFW/glfw3.h GLFW/glfw3.h
@ -41,8 +54,7 @@ find_path( GLFW_INCLUDE_DIR
"${OPENGL_INCLUDE_DIR}" "${OPENGL_INCLUDE_DIR}"
/usr/openwin/share/include /usr/openwin/share/include
/usr/openwin/include /usr/openwin/include
/usr/X11R6/include "${GLFW_X11_INCLUDE_DIRS}"
/usr/include/X11
/opt/graphics/OpenGL/include /opt/graphics/OpenGL/include
/opt/graphics/OpenGL/contrib/libglfw /opt/graphics/OpenGL/contrib/libglfw
/usr/local/include /usr/local/include
@ -66,8 +78,7 @@ find_path( GLFW_INCLUDE_DIR
"${OPENGL_INCLUDE_DIR}" "${OPENGL_INCLUDE_DIR}"
/usr/openwin/share/include /usr/openwin/share/include
/usr/openwin/include /usr/openwin/include
/usr/X11R6/include "${GLFW_X11_INCLUDE_DIRS}"
/usr/include/X11
/opt/graphics/OpenGL/include /opt/graphics/OpenGL/include
/opt/graphics/OpenGL/contrib/libglfw /opt/graphics/OpenGL/contrib/libglfw
/usr/local/include /usr/local/include
@ -91,7 +102,7 @@ if (WIN32)
/usr/lib /usr/lib
/usr/lib/w32api /usr/lib/w32api
/usr/local/lib /usr/local/lib
/usr/X11R6/lib "${GLFW_X11_LIB_DIRS}"
DOC DOC
"The GLFW library" "The GLFW library"
) )
@ -140,29 +151,31 @@ else ()
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(X11 REQUIRED) if(NOT NO_GLFW_X11)
find_package(X11 REQUIRED)
if(NOT X11_Xrandr_FOUND)
message(FATAL_ERROR "Xrandr library not found - required for GLFW")
endif()
if(NOT X11_xf86vmode_FOUND) if(NOT X11_Xrandr_FOUND)
message(FATAL_ERROR "xf86vmode library not found - required for GLFW") message(FATAL_ERROR "Xrandr library not found - required for GLFW")
endif() endif()
if(NOT X11_Xcursor_FOUND) if(NOT X11_xf86vmode_FOUND)
message(FATAL_ERROR "Xcursor library not found - required for GLFW") message(FATAL_ERROR "xf86vmode library not found - required for GLFW")
endif() endif()
if(NOT X11_Xinerama_FOUND) if(NOT X11_Xcursor_FOUND)
message(FATAL_ERROR "Xinerama library not found - required for GLFW") message(FATAL_ERROR "Xcursor library not found - required for GLFW")
endif() endif()
if(NOT X11_Xi_FOUND) if(NOT X11_Xinerama_FOUND)
message(FATAL_ERROR "Xi library not found - required for GLFW") message(FATAL_ERROR "Xinerama library not found - required for GLFW")
endif() endif()
list(APPEND GLFW_x11_LIBRARY "${X11_Xrandr_LIB}" "${X11_Xxf86vm_LIB}" "${X11_Xcursor_LIB}" "${X11_Xinerama_LIB}" "${X11_Xi_LIB}" "${X11_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}" -lrt -ldl) if(NOT X11_Xi_FOUND)
message(FATAL_ERROR "Xi library not found - required for GLFW")
endif()
list(APPEND GLFW_x11_LIBRARY "${X11_Xrandr_LIB}" "${X11_Xxf86vm_LIB}" "${X11_Xcursor_LIB}" "${X11_Xinerama_LIB}" "${X11_Xi_LIB}" "${X11_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}" -lrt -ldl)
endif (NOT NO_GLFW_X11)
find_library( GLFW_glfw_LIBRARY find_library( GLFW_glfw_LIBRARY
NAMES NAMES
@ -181,7 +194,7 @@ else ()
/usr/local/lib /usr/local/lib
/usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE} /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/openwin/lib /usr/openwin/lib
/usr/X11R6/lib "${GLFW_X11_LIB_DIRS}"
DOC DOC
"The GLFW library" "The GLFW library"
) )