Skip to content

feat(CppUnit): add ENABLE_INSTALL_CPPUNIT option to control installation #5229

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

Merged
matejk merged 1 commit into from
Feb 28, 2026
+24 −15
Merged

feat(CppUnit): add ENABLE_INSTALL_CPPUNIT option to control installation #5229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ jobs:
- uses: actions/checkout@v4
- run: sudo apt -y update && sudo apt -y install libssl-dev
- run: >-
cmake -S. -Bcmake-build -GNinja -DPOCO_MINIMAL_BUILD=ON -DENABLE_TRACE=ON -DENABLE_TESTS=ON
cmake -S. -Bcmake-build -GNinja -DPOCO_MINIMAL_BUILD=ON -DENABLE_TRACE=ON -DENABLE_TESTS=ON -DENABLE_INSTALL_CPPUNIT=ON
- run: cmake --build cmake-build --target all --parallel 4
- uses: ./.github/actions/retry-action
with:
Expand Down Expand Up @@ -530,7 +530,7 @@ jobs:
- uses: actions/checkout@v4
- run: brew install openssl@3
- run: >-
cmake -S. -Bcmake-build -DPOCO_MINIMAL_BUILD=ON -DENABLE_TRACE=ON -DENABLE_TESTS=ON
cmake -S. -Bcmake-build -DPOCO_MINIMAL_BUILD=ON -DENABLE_TRACE=ON -DENABLE_TESTS=ON -DENABLE_INSTALL_CPPUNIT=ON
-DENABLE_ACTIVERECORD=OFF -DENABLE_ACTIVERECORD_COMPILER=OFF -DENABLE_APACHECONNECTOR=OFF
- run: cmake --build cmake-build --target all --parallel 4
- uses: ./.github/actions/retry-action
Expand Down
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@ endif()
option(ENABLE_CPPUNIT
"Set to OFF|ON (default is OFF) to enable CppUnit library" OFF)

option(ENABLE_INSTALL_CPPUNIT
"Set to OFF|ON (default is OFF) to install CppUnit headers and libraries" OFF)

option(ENABLE_TESTS
"Set to OFF|ON (default is OFF) to control build of POCO tests" OFF)

Expand Down Expand Up @@ -441,6 +444,10 @@ if(ENABLE_POCODOC)
set(ENABLE_DATA_SQLITE ON CACHE BOOL "Enable Data SQLite" FORCE)
endif()

if(ENABLE_INSTALL_CPPUNIT)
set(ENABLE_CPPUNIT ON CACHE BOOL "Enable CppUnit" FORCE)
endif()

if(ENABLE_TESTS)
set(ENABLE_CPPUNIT ON CACHE BOOL "Enable CppUnit" FORCE)

Expand Down
28 changes: 15 additions & 13 deletions CppUnit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,19 @@ elseif (MINGW)
target_compile_definitions(CppUnit PUBLIC _DLL)
endif()

install(
DIRECTORY include/CppUnit
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
COMPONENT Devel
)
if(ENABLE_INSTALL_CPPUNIT)
install(
DIRECTORY include/CppUnit
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
COMPONENT Devel
)

install(
TARGETS CppUnit
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
install(
TARGETS CppUnit
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
endif()
Loading