mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 13:26:10 +01:00
Keep generated headers within project binary directory
This stops them from appearing in the build directories of projects that may consume Catch2.
This commit is contained in:
parent
78bb4fda05
commit
1be954ff70
@ -39,7 +39,7 @@ set(BENCHMARK_FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
|
|||||||
|
|
||||||
|
|
||||||
set(IMPL_HEADERS
|
set(IMPL_HEADERS
|
||||||
"${CMAKE_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
|
"${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
|
||||||
${SOURCES_DIR}/catch_user_config.hpp.in
|
${SOURCES_DIR}/catch_user_config.hpp.in
|
||||||
${SOURCES_DIR}/catch_all.hpp
|
${SOURCES_DIR}/catch_all.hpp
|
||||||
${SOURCES_DIR}/catch_approx.hpp
|
${SOURCES_DIR}/catch_approx.hpp
|
||||||
@ -321,7 +321,7 @@ set(ALL_FILES
|
|||||||
)
|
)
|
||||||
|
|
||||||
set(FILTERED_FILES ${ALL_FILES})
|
set(FILTERED_FILES ${ALL_FILES})
|
||||||
list(REMOVE_ITEM FILTERED_FILES "${CMAKE_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp")
|
list(REMOVE_ITEM FILTERED_FILES "${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp")
|
||||||
source_group(
|
source_group(
|
||||||
TREE ${SOURCES_DIR}
|
TREE ${SOURCES_DIR}
|
||||||
PREFIX sources
|
PREFIX sources
|
||||||
@ -329,7 +329,7 @@ source_group(
|
|||||||
)
|
)
|
||||||
source_group("generated headers"
|
source_group("generated headers"
|
||||||
FILES
|
FILES
|
||||||
"${CMAKE_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
|
"${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(Catch2 ${ALL_FILES})
|
add_library(Catch2 ${ALL_FILES})
|
||||||
@ -372,13 +372,13 @@ target_compile_features(Catch2
|
|||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
"${SOURCES_DIR}/catch_user_config.hpp.in"
|
"${SOURCES_DIR}/catch_user_config.hpp.in"
|
||||||
"${CMAKE_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
|
"${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(Catch2
|
target_include_directories(Catch2
|
||||||
PUBLIC
|
PUBLIC
|
||||||
$<BUILD_INTERFACE:${SOURCES_DIR}/..>
|
$<BUILD_INTERFACE:${SOURCES_DIR}/..>
|
||||||
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-includes>
|
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-includes>
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -426,7 +426,7 @@ if (NOT_SUBPROJECT)
|
|||||||
install(
|
install(
|
||||||
DIRECTORY
|
DIRECTORY
|
||||||
"${SOURCES_DIR}"
|
"${SOURCES_DIR}"
|
||||||
"${CMAKE_BINARY_DIR}/generated-includes/catch2" # Also install the generated header
|
"${PROJECT_BINARY_DIR}/generated-includes/catch2" # Also install the generated header
|
||||||
DESTINATION
|
DESTINATION
|
||||||
"${CMAKE_INSTALL_INCLUDEDIR}"
|
"${CMAKE_INSTALL_INCLUDEDIR}"
|
||||||
FILES_MATCHING
|
FILES_MATCHING
|
||||||
@ -447,7 +447,7 @@ if (CATCH_BUILD_EXAMPLES OR CATCH_BUILD_EXTRA_TESTS)
|
|||||||
target_include_directories(Catch2_buildall_interface
|
target_include_directories(Catch2_buildall_interface
|
||||||
INTERFACE
|
INTERFACE
|
||||||
$<BUILD_INTERFACE:${SOURCES_DIR}/..>
|
$<BUILD_INTERFACE:${SOURCES_DIR}/..>
|
||||||
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-includes>
|
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-includes>
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||||
)
|
)
|
||||||
target_compile_definitions(Catch2_buildall_interface
|
target_compile_definitions(Catch2_buildall_interface
|
||||||
|
Loading…
Reference in New Issue
Block a user