Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/projects
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-11-30 17:41:41 +0100
committerMartin Hořeňovský2019-11-30 17:41:41 +0100
commite341b1146771aeb654674e7ef6101e67d12f491b (patch)
treef3a4c5b63da299e0fa14dbb284d6325b5947e2e4 /projects
parent443fa0fc8878f4e270ae4f64331ee52b70722fe1 (diff)
downloadcatch3-e341b1146771aeb654674e7ef6101e67d12f491b.tar.gz
WIP: CMake changes to build static lib + tests separately
Diffstat (limited to 'projects')
-rw-r--r--projects/CMakeLists.txt11
1 files changed, 3 insertions, 8 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index ca728604..d01f4375 100644
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -70,12 +70,6 @@ CheckFileList(SURROGATE_SOURCES ${SELF_TEST_DIR}/SurrogateCpps)
# Please keep these ordered alphabetically
-set(TOP_LEVEL_HEADERS
- ${HEADER_DIR}/catch.hpp
- )
-CheckFileList(TOP_LEVEL_HEADERS ${HEADER_DIR})
-
-# Please keep these ordered alphabetically
set(EXTERNAL_HEADERS
${HEADER_DIR}/external/clara.hpp
)
@@ -84,7 +78,7 @@ CheckFileList(EXTERNAL_HEADERS ${HEADER_DIR}/external)
# Please keep these ordered alphabetically
set(BENCHMARK_HEADERS
- ${HEADER_DIR}/internal/benchmark/catch_benchmark.hpp
+ ${HEADER_DIR}/internal/benchmark/catch_benchmark.hpp
${HEADER_DIR}/internal/benchmark/catch_chronometer.hpp
${HEADER_DIR}/internal/benchmark/catch_clock.hpp
${HEADER_DIR}/internal/benchmark/catch_constructor.hpp
@@ -309,7 +303,8 @@ SOURCE_GROUP("Surrogates" FILES ${SURROGATE_SOURCES})
include(CTest)
-add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${REPORTER_SOURCES} ${SURROGATE_SOURCES} ${HEADERS})
+add_executable(SelfTest ${TEST_SOURCES})
+target_link_libraries(SelfTest PRIVATE Catch2)
target_include_directories(SelfTest PRIVATE ${HEADER_DIR})
# It took CMake until 3.8 to abandon the doomed approach of enumerating