Updating library templates and version.

Author: sean-parent

.github/workflows/ci.yml

@@ -69,22 +69,58 @@ jobs:
           cd ${{ runner.temp }}/test-find-package
 
           # Get project name from CMakeLists.txt
-          THIS_PROJECT_NAME=$(grep -m1 "project(" ${{ github.workspace }}/CMakeLists.txt | sed 's/project(\(.*\))/\1/' | awk '{print $1}')
+          PACKAGE_NAME=$(grep -m1 "project(" ${{ github.workspace }}/CMakeLists.txt | sed 's/project(\([^)]*\)).*/\1/' | awk '{print $1}')
 
           # Create test CMakeLists.txt
           cat > CMakeLists.txt << EOF
           cmake_minimum_required(VERSION 3.20)
           project(test-find-package CXX)
 
           set(CMAKE_PREFIX_PATH "${{ runner.temp }}/install")
-          find_package(${THIS_PROJECT_NAME} REQUIRED)
+          find_package(${PACKAGE_NAME} REQUIRED)
 
-          message(STATUS "Successfully found ${THIS_PROJECT_NAME}")
+          message(STATUS "Successfully found ${PACKAGE_NAME}")
           EOF
 
           # Test find_package
           cmake -B build -S .
 
+      - name: Test CPMFindPackage
+        shell: bash
+        run: |
+          # Create test to verify CPMFindPackage works (tries find_package first, then CPM)
+          mkdir -p ${{ runner.temp }}/test-cpm
+          cd ${{ runner.temp }}/test-cpm
+
+          # Download CPM.cmake
+          mkdir cmake
+          curl -L https://github.com/cpm-cmake/CPM.cmake/releases/latest/download/get_cpm.cmake -o cmake/CPM.cmake
+
+          # Get project name from CMakeLists.txt
+          PACKAGE_NAME=$(grep -m1 "project(" ${{ github.workspace }}/CMakeLists.txt | sed 's/project(\([^)]*\)).*/\1/' | awk '{print $1}')
+
+          # Create test CMakeLists.txt that uses CPMFindPackage
+          cat > CMakeLists.txt << EOF
+          cmake_minimum_required(VERSION 3.20)
+          project(test-cpm CXX)
+
+          set(CMAKE_PREFIX_PATH "${{ runner.temp }}/install")
+          set(CPM_SOURCE_CACHE \${CMAKE_SOURCE_DIR}/.cache/cpm CACHE PATH "CPM cache")
+          include(cmake/CPM.cmake)
+
+          # CPMFindPackage tries find_package first, then falls back to CPMAddPackage
+          CPMFindPackage(
+              NAME ${PACKAGE_NAME}
+              GITHUB_REPOSITORY ${{ github.repository }}
+              GIT_TAG ${{ github.sha }}
+          )
+
+          message(STATUS "Successfully acquired ${PACKAGE_NAME} via CPMFindPackage")
+          EOF
+
+          # Test CPMFindPackage (should find the installed version first)
+          cmake -B build -S .
+
   clang-tidy:
     runs-on: ubuntu-latest
 

CMakeLists.txt

@@ -16,7 +16,7 @@ include(cmake/CPM.cmake)
 #     NAME cpp-library
 #     URL "${CMAKE_SOURCE_DIR}/../cpp-library"
 # )
-CPMAddPackage("gh:stlab/cpp-library#3ab13f2be3b835fd1e6feaab7845088c31642eba")
+CPMAddPackage("gh:stlab/cpp-library#79bc0a0f8680185273ae33477f9fbd7b6d137ccb")
 # CPMAddPackage("gh:stlab/cpp-library@4.0.5")
 
 include(${cpp-library_SOURCE_DIR}/cpp-library.cmake)