Merge pull request #57 from ClausKlein/feature/prepare-cmake-workflow-presets

Fix cmake config pkg export

Author: dietmarkuehl

.cmake-format

@@ -0,0 +1,18 @@
+format:
+  line_width: 119
+  tab_size: 2
+  max_subgroups_hwrap: 4
+  max_rows_cmdline: 8
+  separate_ctrl_name_with_space: false
+  separate_fn_name_with_space: false
+  dangle_parens: true
+  dangle_align: prefix
+  line_ending: unix
+  keyword_case: upper
+  always_wrap:
+  - file
+  - install
+  - write_basic_package_version_file
+
+markup:
+  enable_markup: false

.gitignore

@@ -35,5 +35,6 @@ build
 mkerr
 olderr
 .DS_store
+.vs
 .vscode
 stagedir

CMakeLists.txt

@@ -6,16 +6,25 @@
 cmake_minimum_required(VERSION 3.25...3.31)
 
 project(beman_execution26 VERSION 0.0.1 LANGUAGES CXX)
-set(TARGET_NAME execution26)
-set(TARGET_PREFIX beman.${TARGET_NAME})
-set(TARGET_LIBRARY beman_${TARGET_NAME})
-set(TARGET_ALIAS beman::${TARGET_NAME})
-set(TARGETS_EXPORT_NAME ${CMAKE_PROJECT_NAME}Targets)
 
-set(CMAKE_CXX_STANDARD 26)
+set(TARGET_NAME execution26)
+set(TARGET_NAMESPACE beman) # FIXME: not used in install(EXPORT ...) CK?
+set(TARGET_PREFIX ${TARGET_NAMESPACE}.${TARGET_NAME})
+set(TARGET_LIBRARY ${PROJECT_NAME})
+set(TARGET_ALIAS ${TARGET_LIBRARY}::${TARGET_LIBRARY})
+set(TARGET_PACKAGE_NAME ${PROJECT_NAME}-config)
+set(TARGETS_EXPORT_NAME ${PROJECT_NAME}-targets)
 
 include(GNUInstallDirs)
-set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake)
+set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+
+if(NOT DEFINED CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 23)
+endif()
+
+if(NOT DEFINED CMAKE_PREFIX_PATH)
+  set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX})
+endif()
 
 add_subdirectory(src/beman/execution26)
 
@@ -29,16 +38,18 @@ endif()
 include(CMakePackageConfigHelpers)
 
 write_basic_package_version_file(
-  ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
-  VERSION ${PROJECT_VERSION}
-  COMPATIBILITY AnyNewerVersion)
+  ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}-version.cmake
+  VERSION ${CMAKE_PROJECT_VERSION}
+  COMPATIBILITY AnyNewerVersion
+)
 
 configure_package_config_file(
-  "cmake/Config.cmake.in"
-  ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
-  INSTALL_DESTINATION ${INSTALL_CONFIGDIR})
+  "cmake/Config.cmake.in" ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}.cmake
+  INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
+)
 
 install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
-        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
-  DESTINATION ${INSTALL_CONFIGDIR})
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}-version.cmake
+  DESTINATION ${INSTALL_CONFIGDIR}
+)

CMakePresets.json

@@ -2,7 +2,7 @@
   "version": 6,
   "configurePresets": [
     {
-      "name": "_root-config",
+      "name": "root-config",
       "hidden": true,
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/${presetName}",
@@ -19,35 +19,45 @@
       }
     },
     {
-      "name": "_debug-base",
+      "name": "debug-base-unix",
       "hidden": true,
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak -fsanitize=undefined"
+      },
+      "condition": {
+        "type": "notEquals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
       }
     },
     {
-      "name": "_release-base",
+      "name": "release-base-unix",
       "hidden": true,
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Wno-shadow -Wconversion -Wsign-conversion -Wcast-align -Wcast-qual -Woverloaded-virtual -Wformat=2 -Wno-error"
+      },
+      "condition": {
+        "type": "notEquals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
       }
     },
     {
       "name": "debug",
       "displayName": "Debug Build",
       "inherits": [
-        "_root-config",
-        "_debug-base"
+        "root-config",
+        "debug-base-unix"
       ]
     },
     {
       "name": "release",
       "displayName": "Release Build",
       "inherits": [
-        "_root-config",
-        "_release-base"
+        "root-config",
+        "release-base-unix"
       ]
     }
   ],
@@ -72,7 +82,7 @@
   ],
   "testPresets": [
     {
-      "name": "_test_base",
+      "name": "test_base",
       "hidden": true,
       "output": {
         "outputOnFailure": true
@@ -84,12 +94,12 @@
     },
     {
       "name": "debug",
-      "inherits": "_test_base",
+      "inherits": "test_base",
       "configurePreset": "debug"
     },
     {
       "name": "release",
-      "inherits": "_test_base",
+      "inherits": "test_base",
       "configurePreset": "release"
     }
   ],

cmake/Config.cmake.in

@@ -4,4 +4,4 @@
 @PACKAGE_INIT@
 
 include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
-check_required_components("@PROJECT_NAME@")
+check_required_components("@TARGET_LIBRARY@")

examples/CMakeLists.txt

@@ -3,12 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 # cmake-format: on
 
-set(EXAMPLES
-  when_all-cancel
-  stop_token
-  stopping
-  allocator
-)
+list(APPEND EXAMPLES when_all-cancel stop_token stopping allocator)
 
 foreach(EXAMPLE ${EXAMPLES})
   set(EXAMPLE_TARGET ${TARGET_PREFIX}.examples.${EXAMPLE})