Update README.md too

Author: ClausKlein

CMakeLists.txt

@@ -1,10 +1,14 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.14...3.31)
 
 set(PACKAGE_PROJECT_ROOT_PATH
     "${CMAKE_CURRENT_LIST_DIR}"
     CACHE INTERNAL "The path to the PackageProject directory"
 )
 
+# if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.31.0")
+#   cmake_policy(SET CMP0177 NEW)
+# endif()
+
 function(packageProject)
   include(CMakePackageConfigHelpers)
   include(GNUInstallDirs)
@@ -133,7 +137,7 @@ function(packageProject)
     set(PROJECT_RUNTIME_DESTINATION ${PROJECT_NAME}${PROJECT_VERSION_SUFFIX})
   endif()
 
-  if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.23.0" AND PROJECT_HEADER_SETS)
+  if(PROJECT_HEADER_SETS)
     # required to install if use in project target since CMake 3.23
     set(FILE_SET_ARGS "FILE_SET" "${PROJECT_HEADER_SETS}")
   endif()

README.md

@@ -5,7 +5,7 @@
 Creating installable CMake scripts always requires a large amount of boilerplate code to get things working.
 This small script should simplify the CMake packaging process into a single, easy-to-use command.
 
-PackageProject.cmake has been tested with CMake v3.18.4.
+PackageProject.cmake has been tested with CMake v3.24.4.
 
 ## Usage
 
@@ -15,7 +15,7 @@ Also the [CPM.cmake](https://github.com/TheLartians/CPM.cmake) script should be
 See [here](https://github.com/TheLartians/ModernCppStarter/blob/master/CMakeLists.txt) for an example usage.
 
 ```cmake
-CPMAddPackage("gh:TheLartians/PackageProject.cmake@1.6.0")
+CPMAddPackage("gh:TheLartians/PackageProject.cmake@1.14.0")
 
 packageProject(
   # the name of the target to export
@@ -53,6 +53,9 @@ packageProject(
   # by default libs will be installed to <...>/lib/<packagename-version>/
   # / - means relative to <...>/lib, i.e. install libs to <...>/lib/, bins to <...>/bin/, etc
   RUNTIME_DESTINATION /
+  # (optional) FILE_SET "public_headers;..."
+  # Install the target releated header file sets too
+  HEADER_SETS HEADERS
 )
 ```
 

test/header_only/CMakeLists.txt

@@ -2,37 +2,47 @@ cmake_minimum_required(VERSION 3.24...3.31)
 
 project(
   header_only
-  VERSION 1.0
+  VERSION 1.0.0.0
   LANGUAGES CXX
   DESCRIPTION "A header only dependency for testing PackageProject.cmake"
 )
 
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../.. PackageProject)
+
 # supported in CMake 3.23 and newer
 set(CMAKE_VERIFY_INTERFACE_HEADER_SETS ON)
 
 add_library(header_only INTERFACE)
 
+string(TOLOWER ${PROJECT_NAME}/version.h VERSION_HEADER_LOCATION)
+string(TOUPPER ${PROJECT_NAME} UPPERCASE_PROJECT_NAME)
+set(${UPPERCASE_PROJECT_NAME}_VERSION \"${PROJECT_VERSION}\")
+configure_file(${PACKAGE_PROJECT_ROOT_PATH}/version.h.in ${VERSION_HEADER_LOCATION} @ONLY)
+
 if(CMAKE_VERIFY_INTERFACE_HEADER_SETS)
   target_sources(
-    header_only PUBLIC FILE_SET HEADERS BASE_DIRS include FILES include/header_only/adder.h
+    header_only
+    PUBLIC FILE_SET
+           HEADERS
+           BASE_DIRS
+           include
+           ${PROJECT_BINARY_DIR}
+           FILES
+           include/header_only/adder.h
+           ${PROJECT_BINARY_DIR}/${VERSION_HEADER_LOCATION}
   )
 else()
   target_include_directories(
     header_only INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-                          $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+                          $<INSTALL_INTERFACE:include>
   )
 endif()
 
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../.. PackageProject)
-
 packageProject(
   NAME ${PROJECT_NAME}
   VERSION ${PROJECT_VERSION}
   BINARY_DIR ${PROJECT_BINARY_DIR}
-  # INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include TODO: INCLUDE_DESTINATION
-  # include/${PROJECT_NAME}-${PROJECT_VERSION}
   INCLUDE_DESTINATION include
-  VERSION_HEADER "${PROJECT_NAME}/version.h"
   DEPENDENCIES ""
   CPACK "${TEST_CPACK}"
   HEADER_SETS HEADERS

test/namespaced_dependency/CMakeLists.txt

@@ -7,7 +7,8 @@ project(
   DESCRIPTION "A namespaced dependency for testing PackageProject.cmake"
 )
 
-set(CMAKE_VERIFY_INTERFACE_HEADER_SETS ON)
+# supported in CMake 3.23 and newer
+set(CMAKE_VERIFY_INTERFACE_HEADER_SETS OFF)
 
 set(PROJECT_NAMESPACE "ns")
 add_library(namespaced_dependency STATIC source/namespaced_dependency.cpp)
@@ -20,7 +21,7 @@ if(CMAKE_VERIFY_INTERFACE_HEADER_SETS)
 else()
   target_include_directories(
     namespaced_dependency PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-                                 $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+                                 $<INSTALL_INTERFACE:include>
   )
 endif()
 
@@ -34,12 +35,13 @@ packageProject(
   VERSION ${PROJECT_VERSION}
   NAMESPACE ${PROJECT_NAMESPACE}
   BINARY_DIR ${PROJECT_BINARY_DIR}
-  # INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include TODO: INCLUDE_DESTINATION
-  # include/${PROJECT_NAME}-${PROJECT_VERSION}
+  INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include
+  # XXX INCLUDE_DESTINATION include/${PROJECT_NAME}-${PROJECT_VERSION}
   INCLUDE_DESTINATION include
   VERSION_HEADER "namespaced_dependency/version.h"
   INCLUDE_HEADER_PATTERN "*.h"
   DEPENDENCIES ""
   CPACK "${TEST_CPACK}"
+  RUNTIME_DESTINATION /
   HEADER_SETS HEADERS
 )

test/transitive_dependency/CMakeLists.txt

@@ -26,8 +26,9 @@ CPMAddPackage(
 # Set default visibility to hidden for all targets
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
+
 # supported in CMake 3.23 and newer
-set(CMAKE_VERIFY_INTERFACE_HEADER_SETS ON)
+set(CMAKE_VERIFY_INTERFACE_HEADER_SETS OFF)
 
 add_library(${PROJECT_NAME} SHARED source/transitive_dependency.cpp)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
@@ -41,7 +42,7 @@ if(CMAKE_VERIFY_INTERFACE_HEADER_SETS)
 else()
   target_include_directories(
     transitive_dependency PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-                                 $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+                                 $<INSTALL_INTERFACE:include>
   )
 endif()
 
@@ -52,12 +53,12 @@ packageProject(
   VERSION ${PROJECT_VERSION}
   NAMESPACE ${PROJECT_NAME}
   BINARY_DIR ${PROJECT_BINARY_DIR}
-  # INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include TODO: INCLUDE_DESTINATION
-  # include/${PROJECT_NAME}-${PROJECT_VERSION}
+  INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include 
   INCLUDE_DESTINATION include
   VERSION_HEADER "transitive_dependency/version.h"
   EXPORT_HEADER "transitive_dependency/export.h"
   DEPENDENCIES "fmt 7.1.3;cxxopts 2.2.0"
   CPACK "${TEST_CPACK}"
+  RUNTIME_DESTINATION /
   HEADER_SETS HEADERS
 )