Fix cmake config pkg export

Author: ClausKlein

.cmake-format

@@ -1,10 +1,18 @@
 format:
-  tab_size: 2
   line_width: 119
-  dangle_parens: true
+  tab_size: 2
+  max_subgroups_hwrap: 4
+  max_rows_cmdline: 8
   separate_ctrl_name_with_space: false
-  always_wrap: install
+  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

CMakeLists.txt

@@ -5,19 +5,15 @@
 
 cmake_minimum_required(VERSION 3.25...3.31)
 
-project(
-  beman_execution26
-  VERSION 0.0.1
-  LANGUAGES CXX
-)
+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(TARGETS_EXPORT_NAME ${CMAKE_PROJECT_NAME}-targets)
 
 include(GNUInstallDirs)
-set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake)
+set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
 
 add_subdirectory(src/beman/execution26)
 
@@ -31,18 +27,18 @@ endif()
 include(CMakePackageConfigHelpers)
 
 write_basic_package_version_file(
-  ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
-  VERSION ${PROJECT_VERSION}
+  ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config-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
+  "cmake/Config.cmake.in" ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.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
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config-version.cmake
   DESTINATION ${INSTALL_CONFIGDIR}
 )

cmake/Config.cmake.in

@@ -4,4 +4,4 @@
 @PACKAGE_INIT@
 
 include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
-check_required_components("@PROJECT_NAME@")
+check_required_components("@CMAKE_PROJECT_NAME@")

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})

src/beman/execution26/CMakeLists.txt

@@ -189,7 +189,7 @@ install(
 
 install(
   EXPORT ${TARGETS_EXPORT_NAME}1
-  FILE ${TARGET_LIBRARY}-config.cmake
-  DESTINATION "${INSTALL_CONFIGDIR}/${TARGET_LIBRARY}"
+  FILE ${TARGETS_EXPORT_NAME}.cmake
+  DESTINATION "${INSTALL_CONFIGDIR}"
   NAMESPACE ${TARGET_LIBRARY}::
 )

src/beman/execution26/tests/CMakeLists.txt

@@ -96,7 +96,6 @@ if(PROJECT_IS_TOP_LEVEL)
   enable_testing()
   find_package(beman_execution26 0.0.1 EXACT REQUIRED)
   if(beman_execution26_FOUND)
-    set(CMAKE_CXX_STANDARD 26)
     set(TARGET_LIBRARY beman_execution26::beman_execution26)
     set(execution_tests exec-awaitable.pass) # only one sample to save time! CK
   endif()
@@ -124,6 +123,7 @@ if(NOT PROJECT_IS_TOP_LEVEL)
       --build-makeprogram ${CMAKE_MAKE_PROGRAM}
       --build-options
           "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
+          "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
           "-DCMAKE_BUILD_TYPE=$<CONFIG>"
           "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
           # TODO(CK): Needed too? "--config $<CONFIG>"