mirror of
https://github.com/PixarAnimationStudios/OpenSubdiv
synced 2024-11-09 13:50:05 +00:00
Merge pull request #1305 from davidgyu/dev_opengl_import_fix
This commit is contained in:
commit
94c85b3879
@ -490,17 +490,16 @@ if(GLEW_FOUND AND GLEW_INCLUDE_DIR)
|
|||||||
${PROJECT_SOURCE_DIR}/glLoader)
|
${PROJECT_SOURCE_DIR}/glLoader)
|
||||||
set(OPENGL_LOADER_LIBRARIES
|
set(OPENGL_LOADER_LIBRARIES
|
||||||
${GLEW_LIBRARY}
|
${GLEW_LIBRARY}
|
||||||
${OPENGL_gl_LIBRARY}
|
OpenGL::GL
|
||||||
${CMAKE_DL_LIBS})
|
${CMAKE_DL_LIBS})
|
||||||
|
|
||||||
elseif(OPENGL_FOUND)
|
elseif(OPENGL_FOUND)
|
||||||
|
|
||||||
osd_detect_gl_version(${PROJECT_SOURCE_DIR}/glLoader/glApi.h)
|
osd_detect_gl_version(${PROJECT_SOURCE_DIR}/glLoader/glApi.h)
|
||||||
set(OPENGL_LOADER_INCLUDE_DIRS
|
set(OPENGL_LOADER_INCLUDE_DIRS
|
||||||
${OPENGL_INCLUDE_DIR}
|
|
||||||
${PROJECT_SOURCE_DIR}/glLoader)
|
${PROJECT_SOURCE_DIR}/glLoader)
|
||||||
set(OPENGL_LOADER_LIBRARIES
|
set(OPENGL_LOADER_LIBRARIES
|
||||||
${OPENGL_gl_LIBRARY}
|
OpenGL::GL
|
||||||
${CMAKE_DL_LIBS})
|
${CMAKE_DL_LIBS})
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user