Merge pull request #117 from GabrielRavier/portableAddOpenGLPolicy

CMakeLists: Fix CMP0072 warning
This commit is contained in:
Clownacy 2020-05-08 18:12:47 +01:00 committed by GitHub
commit 2e8f4cf72e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions

View file

@ -596,6 +596,10 @@ if(BACKEND_RENDERER MATCHES "OpenGLES2")
endif() endif()
if(BACKEND_RENDERER MATCHES "OpenGL3" OR (BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "Software")) if(BACKEND_RENDERER MATCHES "OpenGL3" OR (BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "Software"))
if (CMAKE_VERSION GREATER_EQUAL 3.11)
cmake_policy(SET CMP0072 NEW)
endif()
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
target_link_libraries(CSE2 PRIVATE OpenGL::GL) target_link_libraries(CSE2 PRIVATE OpenGL::GL)
endif() endif()

View file

@ -73,6 +73,10 @@ endif()
add_subdirectory("../external/glad" "glad" EXCLUDE_FROM_ALL) add_subdirectory("../external/glad" "glad" EXCLUDE_FROM_ALL)
target_link_libraries(DoConfig PRIVATE glad) target_link_libraries(DoConfig PRIVATE glad)
if (CMAKE_VERSION GREATER_EQUAL 3.11)
cmake_policy(SET CMP0072 NEW)
endif()
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
target_link_libraries(DoConfig PRIVATE OpenGL::GL) target_link_libraries(DoConfig PRIVATE OpenGL::GL)