From f8023b362d1e285e202b29a1d3724eb93c910560 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Tue, 10 Oct 2023 21:22:32 +0200 Subject: [PATCH 1/2] fix initialization of CMakeLists and cleanup after bump of min cmake version --- build/cmake/CMakeLists.txt | 43 ++++++---------------------- build/cmake/testbuild/CMakeLists.txt | 12 ++------ 2 files changed, 12 insertions(+), 43 deletions(-) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index a9ace8d..fd520ce 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -1,25 +1,12 @@ +cmake_minimum_required(VERSION 3.16) +project(glew LANGUAGES C) + if ( NOT DEFINED CMAKE_BUILD_TYPE ) set( CMAKE_BUILD_TYPE Release CACHE STRING "Build type" ) endif () -project (glew C) - -cmake_minimum_required (VERSION 3.16) - include(GNUInstallDirs) -if(POLICY CMP0003) - cmake_policy (SET CMP0003 NEW) -endif() - -if(POLICY CMP0042) - cmake_policy (SET CMP0042 NEW) -endif() - -if (POLICY CMP0072) - cmake_policy (SET CMP0072 NEW) -endif(POLICY CMP0072) - set(CMAKE_DEBUG_POSTFIX d) option (BUILD_UTILS "utilities" ON) @@ -51,14 +38,6 @@ endif() find_package (OpenGL REQUIRED) -# cmake<3.10 doesn't detect EGL/GLX -if (CMAKE_VERSION VERSION_LESS 3.10) - find_library(OPENGL_egl_LIBRARY NAMES EGL) - if (OPENGL_egl_LIBRARY) - set (OpenGL_EGL_FOUND TRUE) - endif () -endif () - # prefer GLVND if (OPENGL_opengl_LIBRARY) set (GLEW_LIBRARIES ${OPENGL_opengl_LIBRARY}) @@ -178,15 +157,11 @@ endif() target_link_libraries (glew LINK_PUBLIC ${GLEW_LIBRARIES}) target_link_libraries (glew_s ${GLEW_LIBRARIES}) -if(CMAKE_VERSION VERSION_LESS 2.8.12) - set(MAYBE_EXPORT "") -else() - target_compile_definitions(glew_s INTERFACE "GLEW_STATIC") - foreach(t glew glew_s) - target_include_directories(${t} PUBLIC $) - endforeach() - set(MAYBE_EXPORT EXPORT glew-targets) -endif() +target_compile_definitions(glew_s INTERFACE "GLEW_STATIC") +foreach(t glew glew_s) + target_include_directories(${t} PUBLIC $) +endforeach() +set(MAYBE_EXPORT EXPORT glew-targets) set(targets_to_install "") if(BUILD_SHARED_LIBS) @@ -258,7 +233,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glew.pc COMPONENT Development ) -if(WIN32 AND MSVC AND (NOT MSVC_VERSION LESS 1600) AND (NOT CMAKE_VERSION VERSION_LESS "3.1")) +if(WIN32 AND MSVC AND (NOT MSVC_VERSION LESS 1600)) install( FILES $ DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/build/cmake/testbuild/CMakeLists.txt b/build/cmake/testbuild/CMakeLists.txt index 15b9e52..1243478 100644 --- a/build/cmake/testbuild/CMakeLists.txt +++ b/build/cmake/testbuild/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 2.8.12) -project(glew-cmake-test) +cmake_minimum_required(VERSION 3.16) +project(glew-cmake-test LANGUAGES C) find_package(GLEW REQUIRED CONFIG) find_package(GLEW REQUIRED CONFIG) # call twice to test multiple call @@ -10,14 +10,8 @@ set_target_properties(cmake-test PROPERTIES DEBUG_POSTFIX _d) target_link_libraries(cmake-test PRIVATE GLEW::GLEW ${OPENGL_LIBRARIES}) target_include_directories(cmake-test PRIVATE ${OPENGL_INCLUDE_DIR}) -if(CMAKE_VERSION VERSION_LESS 3.0) - set(cgex $) -else() - set(cgex $) -endif() - target_compile_definitions(cmake-test PRIVATE - -DGLEW_CMAKE_TEST_CONFIG=${cgex} + -DGLEW_CMAKE_TEST_CONFIG=$ -DGLEW_CMAKE_TEST_TARGET_FILE_NAME=$ -DGLEW_CMAKE_TEST_TARGET_TYPE=$ ) From f064fbfcb61ee6b8fc7e420b2d1b07d6b09cc49a Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Tue, 10 Oct 2023 21:28:07 +0200 Subject: [PATCH 2/2] more cleanup --- build/cmake/CMakeLists.txt | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index fd520ce..5649972 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -161,7 +161,6 @@ target_compile_definitions(glew_s INTERFACE "GLEW_STATIC") foreach(t glew glew_s) target_include_directories(${t} PUBLIC $) endforeach() -set(MAYBE_EXPORT EXPORT glew-targets) set(targets_to_install "") if(BUILD_SHARED_LIBS) @@ -171,7 +170,7 @@ else () endif() install ( TARGETS ${targets_to_install} - ${MAYBE_EXPORT} + EXPORT glew-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development @@ -247,16 +246,14 @@ install ( DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GL COMPONENT Development) -if(MAYBE_EXPORT) - install(EXPORT glew-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glew - COMPONENT Development - NAMESPACE GLEW::) - install(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/glew-config.cmake - ${CMAKE_CURRENT_SOURCE_DIR}/CopyImportedTargetProperties.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glew - COMPONENT Development) -endif() +install(EXPORT glew-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glew + COMPONENT Development + NAMESPACE GLEW::) +install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/glew-config.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/CopyImportedTargetProperties.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glew + COMPONENT Development) if(NOT TARGET uninstall) configure_file(