Commit 5ead6f2d2c515d3d85c31fffebea55168c1bc1b4
2020-08-25T23:31:13
Update minimum required cmake version to 2.8.11 to simplify code According to https://cmake.org/pipermail/cmake/2013-May/054792.html cmake 2.8.11 was released in 2013, so we can assume that no older version will be used anymore.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e44343d..48b5016 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.11)
if (NOT DEFINED CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE Release CACHE STRING "Build type")
@@ -25,38 +25,33 @@ install (TARGETS dl EXPORT dlfcn-win32-targets
install (FILES ${headers} DESTINATION include)
-# If CMake version is greater than or equal to 2.8.11
-# also install the cmake configuration files to simplify
-# the use of dlfcn-win32 in CMake
-if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.11")
- # Correctly export the location of installed includes in the target
- target_include_directories(dl INTERFACE $<INSTALL_INTERFACE:include>)
+# Correctly export the location of installed includes in the target
+target_include_directories(dl INTERFACE $<INSTALL_INTERFACE:include>)
- # Export the targets (build tree)
- export(EXPORT dlfcn-win32-targets
- FILE "${CMAKE_CURRENT_BINARY_DIR}/dlfcn-win32-targets.cmake"
- NAMESPACE dlfcn-win32::
- )
-
- # Write the CMake config file
- set(CMAKE_CONF_INSTALL_DIR share/dlfcn-win32)
- set(INCLUDE_INSTALL_DIR include)
- include(CMakePackageConfigHelpers)
- configure_package_config_file(dlfcn-win32-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/dlfcn-win32-config.cmake
- INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR}
- PATH_VARS INCLUDE_INSTALL_DIR
- NO_CHECK_REQUIRED_COMPONENTS_MACRO)
+# Export the targets (build tree)
+export(EXPORT dlfcn-win32-targets
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/dlfcn-win32-targets.cmake"
+ NAMESPACE dlfcn-win32::
+)
- # Install the targets (install)
- install(EXPORT dlfcn-win32-targets
- FILE dlfcn-win32-targets.cmake
- NAMESPACE dlfcn-win32::
- DESTINATION ${CMAKE_CONF_INSTALL_DIR})
+# Write the CMake config file
+set(CMAKE_CONF_INSTALL_DIR share/dlfcn-win32)
+set(INCLUDE_INSTALL_DIR include)
+include(CMakePackageConfigHelpers)
+configure_package_config_file(dlfcn-win32-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/dlfcn-win32-config.cmake
+ INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR}
+ PATH_VARS INCLUDE_INSTALL_DIR
+ NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- # Install the CMake config file
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dlfcn-win32-config.cmake
- DESTINATION ${CMAKE_CONF_INSTALL_DIR})
-endif()
+# Install the targets (install)
+install(EXPORT dlfcn-win32-targets
+ FILE dlfcn-win32-targets.cmake
+ NAMESPACE dlfcn-win32::
+ DESTINATION ${CMAKE_CONF_INSTALL_DIR})
+
+# Install the CMake config file
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dlfcn-win32-config.cmake
+ DESTINATION ${CMAKE_CONF_INSTALL_DIR})
if (BUILD_TESTS)
enable_testing()