From 9231ecbcb00037979d14013b5fe1f5c60cfee89a Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Mon, 11 Dec 2017 22:55:33 +0100 Subject: [PATCH] cmake: use OpenGL::GL instead of OpenGL::OpenGL - OpenGL::GL -> defined to the platform-specific OpenGL libraries - OpenGL::OpenGL -> defined to libOpenGL if the system is GLVND --- cmake/modules/FindOpenGL.cmake | 6 +++--- rwlib/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindOpenGL.cmake b/cmake/modules/FindOpenGL.cmake index e5ebfb8f..d199a66b 100644 --- a/cmake/modules/FindOpenGL.cmake +++ b/cmake/modules/FindOpenGL.cmake @@ -1,11 +1,11 @@ include("${CMAKE_ROOT}/Modules/FindOpenGL.cmake") -if(OPENGL_FOUND AND NOT TARGET OpenGL::OpenGL) +if(OPENGL_FOUND AND NOT TARGET OpenGL::GL) list(GET OPENGL_LIBRARIES 0 OPENGL_FIRST_LIBRARY) set(OPENGL_OTHER_LIBRARIES "${OPENGL_LIBRARIES}") list(REMOVE_AT OPENGL_OTHER_LIBRARIES 0) - add_library(OpenGL::OpenGL UNKNOWN IMPORTED) - set_target_properties(OpenGL::OpenGL PROPERTIES + add_library(OpenGL::GL UNKNOWN IMPORTED) + set_target_properties(OpenGL::GL PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C;CXX" IMPORTED_LOCATION "${OPENGL_FIRST_LIBRARY}" INTERFACE_LINK_LIBRARIES "${OPENGL_OTHER_LIBRARIES}" diff --git a/rwlib/CMakeLists.txt b/rwlib/CMakeLists.txt index e8174c74..8a16ac38 100644 --- a/rwlib/CMakeLists.txt +++ b/rwlib/CMakeLists.txt @@ -58,7 +58,7 @@ target_link_libraries(rwlib PUBLIC openrw::interface PRIVATE - OpenGL::OpenGL + OpenGL::GL ) openrw_target_apply_options(TARGET rwlib)