Consolidate cmake package config templates into cmake/package/

Move all cmake package config template files into a single cmake/package/ directory: - CppUTestConfig.cmake.install.in (from repo root) - CppUTestConfig.cmake.build.in (from repo root) - CppUTestConfig.cmake.autotools.in (from build/cmake_package_files/) - CppUTestTargets.cmake.autotools.in (from build/cmake_package_files/) - CppUTestTargets-relwithdebinfo.cmake.autotools.in (from build/cmake_package_files/) - CppUTestConfigVersion.cmake (from build/cmake_package_files/) Also remove the stale pre-generated static cmake files from build/cmake_package_files/ that are superseded by the autotools templates. Update cmake/install.cmake and Makefile.am with the new paths.
cpputest · thetic · Mar 3, 2026 · Mar 3, 2026 · Mar 3, 2026 · Mar 3, 2026
commit d1da5cd9bdc9fd1dfe7de4f55dbecc6e1c952a39
diff --git a/Makefile.am b/Makefile.am
@@ -41,21 +41,21 @@ cmakescripts_DATA = \
 
 cmakedir = $(libdir)/CppUTest/cmake
 cmake_DATA = \
-  build/cmake_package_files/CppUTestConfigVersion.cmake
+  cmake/package/CppUTestConfigVersion.cmake
 
 # The three cmake files below embed the install prefix and libdir, so they must
 # be generated from templates at install time rather than copied as static files.
 # This ensures the correct paths are used even when --libdir differs from the
 # default (e.g. Debian multiarch: lib/x86_64-linux-gnu instead of lib).
 install-data-hook:
 	sed -e "s|%%PREFIX%%|$(prefix)|g" \
-	    $(srcdir)/build/cmake_package_files/CppUTestConfig.cmake.autotools.in \
+	    $(srcdir)/cmake/package/CppUTestConfig.cmake.autotools.in \
 	    > "$(DESTDIR)$(cmakedir)/CppUTestConfig.cmake"
 	sed -e "s|%%PREFIX%%|$(prefix)|g" \
-	    $(srcdir)/build/cmake_package_files/CppUTestTargets.cmake.autotools.in \
+	    $(srcdir)/cmake/package/CppUTestTargets.cmake.autotools.in \
 	    > "$(DESTDIR)$(cmakedir)/CppUTestTargets.cmake"
 	sed -e "s|%%LIBDIR%%|$(libdir)|g" \
-	    $(srcdir)/build/cmake_package_files/CppUTestTargets-relwithdebinfo.cmake.autotools.in \
+	    $(srcdir)/cmake/package/CppUTestTargets-relwithdebinfo.cmake.autotools.in \
 	    > "$(DESTDIR)$(cmakedir)/CppUTestTargets-relwithdebinfo.cmake"
 
 uninstall-local:

diff --git a/build/cmake_package_files/CppUTestConfig.cmake b/build/cmake_package_files/CppUTestConfig.cmake
diff --git a/build/cmake_package_files/CppUTestTargets-relwithdebinfo.cmake b/build/cmake_package_files/CppUTestTargets-relwithdebinfo.cmake
diff --git a/build/cmake_package_files/CppUTestTargets.cmake b/build/cmake_package_files/CppUTestTargets.cmake
diff --git a/cmake/install.cmake b/cmake/install.cmake
@@ -19,7 +19,7 @@ include(CMakePackageConfigHelpers)
 
 set(CPPUTEST_CONFIG_DEST "${LIB_INSTALL_DIR}/CppUTest/cmake")
 
-configure_package_config_file(CppUTestConfig.cmake.install.in
+configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/package/CppUTestConfig.cmake.install.in
     ${CMAKE_CURRENT_BINARY_DIR}/install/CppUTestConfig.cmake
     INSTALL_DESTINATION "${CPPUTEST_CONFIG_DEST}"
     PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR)
@@ -49,7 +49,7 @@ install(
         ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/_CppUTestDiscovery.cmake
     DESTINATION "${CPPUTEST_CONFIG_DEST}/Modules"
 )
-configure_package_config_file(CppUTestConfig.cmake.build.in
+configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/package/CppUTestConfig.cmake.build.in
     ${CMAKE_CURRENT_BINARY_DIR}/CppUTestConfig.cmake
     INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
     PATH_VARS INCLUDE_DIR CMAKE_CURRENT_BINARY_DIR

diff --git a/...e_files/CppUTestConfig.cmake.autotools.in → ...package/CppUTestConfig.cmake.autotools.in b/...e_files/CppUTestConfig.cmake.autotools.in → ...package/CppUTestConfig.cmake.autotools.in
diff --git a/CppUTestConfig.cmake.build.in → cmake/package/CppUTestConfig.cmake.build.in b/CppUTestConfig.cmake.build.in → cmake/package/CppUTestConfig.cmake.build.in
diff --git a/CppUTestConfig.cmake.install.in → ...e/package/CppUTestConfig.cmake.install.in b/CppUTestConfig.cmake.install.in → ...e/package/CppUTestConfig.cmake.install.in
diff --git a/...package_files/CppUTestConfigVersion.cmake → cmake/package/CppUTestConfigVersion.cmake b/...package_files/CppUTestConfigVersion.cmake → cmake/package/CppUTestConfigVersion.cmake
diff --git a/...Targets-relwithdebinfo.cmake.autotools.in → ...Targets-relwithdebinfo.cmake.autotools.in b/...Targets-relwithdebinfo.cmake.autotools.in → ...Targets-relwithdebinfo.cmake.autotools.in
diff --git a/..._files/CppUTestTargets.cmake.autotools.in → ...ackage/CppUTestTargets.cmake.autotools.in b/..._files/CppUTestTargets.cmake.autotools.in → ...ackage/CppUTestTargets.cmake.autotools.in