Merge pull request #1305 from davidgyu/dev_opengl_import_fix

This commit is contained in:
Barry Fowler 2023-06-27 18:14:02 -07:00 committed by GitHub
commit 94c85b3879
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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()