From ef2db3c1e52474b881812da92ae495cd936ed150 Mon Sep 17 00:00:00 2001 From: alandefreitas Date: Fri, 1 Jul 2022 02:47:14 -0300 Subject: [PATCH] update CMake test subdirs --- CMakeLists.txt | 7 +++++++ test/cmake_test/CMakeLists.txt | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca486d18f..4cb24496b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,6 +121,13 @@ if(BOOST_URL_INSTALL AND NOT BOOST_SUPERPROJECT_VERSION) LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) + + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/boost + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.hpp" + PATTERN "*.ipp" + ) endif() diff --git a/test/cmake_test/CMakeLists.txt b/test/cmake_test/CMakeLists.txt index 2e40c99cb..2dc77eabd 100644 --- a/test/cmake_test/CMakeLists.txt +++ b/test/cmake_test/CMakeLists.txt @@ -29,6 +29,17 @@ else() add_subdirectory(../../../align boostorg/align) add_subdirectory(../../../system boostorg/system) add_subdirectory(../../../container boostorg/container) + + # Conditional deps + if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../detail/CMakeLists.txt") + add_subdirectory(../../../detail boostorg/detail) + endif() + if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../preprocessor/CMakeLists.txt") + add_subdirectory(../../../preprocessor boostorg/preprocessor) + endif() + if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../integer/CMakeLists.txt") + add_subdirectory(../../../integer boostorg/integer) + endif() endif() add_executable(main main.cpp)