Skip to content

Fix autotools cmake package install for non-standard libdir #1881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thetic wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Fix autotools cmake package install for non-standard libdir #1881

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e90a246
Fix autotools cmake package files for non-standard libdir (Debian mul…
thetic Mar 3, 2026
d1da5cd
Consolidate cmake package config templates into cmake/package/
thetic Mar 3, 2026
3159f71
Move package/install template files into pkg/
thetic Mar 3, 2026
f9ace4e
Move cmake/install.cmake to pkg/CMakeLists.txt
thetic Mar 3, 2026
147579e
Fix incomplete autotools cmake module install
thetic Mar 3, 2026
582b0dc
Fix autotools cmake targets to use CppUTest:: namespace
thetic Mar 3, 2026
b9a11cb
Modernize autotools cmake targets templates to match current cmake ou…
thetic Mar 3, 2026
46367c0
Fix misleading 'Generated by CMake' comments in autotools templates
thetic Mar 3, 2026
1157ae3
Add CI job to test autotools custom prefix install and cmake consumption
thetic Mar 3, 2026
ebc9ea5
Remove unused build-tree cmake package config
thetic Mar 3, 2026
f761321
Fold library locations into CppUTestTargets.cmake.autotools.in
thetic Mar 3, 2026
8a685a1
Add INTERFACE_COMPILE_OPTIONS for memory leak detection to autotools …
thetic Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix incomplete autotools cmake module install 
The autotools install was missing two cmake modules needed for downstream
consumers to use cpputest_discover_tests():

- CppUTest.cmake and _CppUTestDiscovery.cmake were not listed in
  cmakemodules_DATA in Makefile.am
- CppUTestConfig.cmake.autotools.in did not append the Modules directory
  to CMAKE_MODULE_PATH, so include(CppUTest) would fail even if the files
  were present

Both are present in the CMake install; bring the autotools install into
parity.
  • Loading branch information
@thetic
thetic committed Mar 3, 2026
commit 147579ecc9efa2fdd57e155e1a57a137981dddc8
4 changes: 3 additions & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ pkgconfig_DATA = cpputest.pc

cmakemodulesdir = $(libdir)/CppUTest/cmake/Modules
cmakemodules_DATA = \
cmake/Modules/CppUTestBuildTimeDiscoverTests.cmake
cmake/Modules/CppUTest.cmake \
cmake/Modules/CppUTestBuildTimeDiscoverTests.cmake \
cmake/Modules/_CppUTestDiscovery.cmake

cmakescriptsdir = $(libdir)/CppUTest/cmake/Scripts
cmakescripts_DATA = \
Expand Down
1 change: 1 addition & 0 deletions pkg/CppUTestConfig.cmake.autotools.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ endmacro()
####################################################################################

set_and_check(CppUTest_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Modules")
include("${CMAKE_CURRENT_LIST_DIR}/CppUTestTargets.cmake")
set(CppUTest_LIBRARIES CppUTest CppUTestExt)
include("${CMAKE_CURRENT_LIST_DIR}/Modules/CppUTestBuildTimeDiscoverTests.cmake")
Expand Down