fix: fetch sanitizers-cmake only when either test or examples are ena…

…bled
DNKpp · Sep 23, 2024 · 77dee8e · 77dee8e
1 parent aa3cd16
commit 77dee8e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,17 +9,6 @@ project(
 	VERSION 1
 )
 
-CPMAddPackage(
-	NAME sanitizers-cmake
-	GITHUB_REPOSITORY "arsenm/sanitizers-cmake"
-	GIT_TAG "3f0542e4e034aab417c51b2b22c94f83355dee15"
-	SYSTEM YES
-	EXCLUDE_FROM_ALL YES
-	DOWNLOAD_ONLY YES
-)
-list(APPEND CMAKE_MODULE_PATH "${sanitizers-cmake_SOURCE_DIR}/cmake")
-find_package(Sanitizers)
-
 add_library(mimicpp INTERFACE)
 add_library(mimicpp::mimicpp ALIAS mimicpp)
 target_include_directories(

diff --git a/cmake/FIndsanitizers-cmake.cmake b/cmake/FIndsanitizers-cmake.cmake
@@ -0,0 +1,16 @@
+CPMAddPackage(
+	NAME sanitizers-cmake
+	GITHUB_REPOSITORY "arsenm/sanitizers-cmake"
+	GIT_TAG "3f0542e4e034aab417c51b2b22c94f83355dee15"
+	SYSTEM YES
+	EXCLUDE_FROM_ALL YES
+	DOWNLOAD_ONLY YES
+)
+
+if (sanitizers-cmake_ADDED)
+
+	list(APPEND CMAKE_MODULE_PATH "${sanitizers-cmake_SOURCE_DIR}/cmake")
+
+endif()
+
+find_package(Sanitizers REQUIRED)
diff --git a/cmake/FindCatch2.cmake b/cmake/FindCatch2.cmake
@@ -0,0 +1,5 @@
+CPMAddPackage("gh:catchorg/[email protected]")
+
+if (Catch2_ADDED)
+	include("${Catch2_SOURCE_DIR}/extras/Catch.cmake")
+endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,5 +1,6 @@
 find_package(Catch2 REQUIRED)
-include("${Catch2_SOURCE_DIR}/extras/Catch.cmake")
+
+find_package(sanitizers-cmake REQUIRED)
 
 add_executable(
 	mimicpp-examples

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(sanitizers-cmake REQUIRED)
+
 add_subdirectory("unit-tests")
 
 option(MIMICPP_ENABLE_ADAPTER_TESTS "Determines, whether the adapter tests shall be built." OFF)

diff --git a/test/adapter-tests/catch2/CMakeLists.txt b/test/adapter-tests/catch2/CMakeLists.txt
@@ -1,5 +1,4 @@
 find_package(Catch2 REQUIRED)
-include("${Catch2_SOURCE_DIR}/extras/Catch.cmake")
 
 add_executable(
 	mimicpp-adapter-tests-catch2

diff --git a/test/unit-tests/CMakeLists.txt b/test/unit-tests/CMakeLists.txt
@@ -1,6 +1,5 @@
-CPMAddPackage("gh:catchorg/Catch2@3.7.1")
+find_package(Catch2 REQUIRED)
 CPMAddPackage("gh:rollbear/trompeloeil@48")
-include("${Catch2_SOURCE_DIR}/extras/Catch.cmake")
 
 add_executable(
 	mimicpp-tests
@@ -9,6 +8,7 @@ add_executable(
 	"Expectation.cpp"
 	"ExpectationBuilder.cpp"
 	"ExpectationPolicies.cpp"
+	"InterfaceMock.cpp"
 	"Matcher.cpp"
 	"Mock.cpp"
 	"Printer.cpp"