mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
2e08b4ad3c
Based on the work on the work in NHorus's previous PR. Closes: https://bugs.gentoo.org/951166 Thanks-To: NHOrus <jy6x2b32pie9@yahoo.com> Signed-off-by: Alfred Wingate <parona@protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/41992 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
Unbundle dev-cpp/catch
|
|
https://bugs.gentoo.org/951166
|
|
--- a/test/CMakeLists.txt
|
|
+++ b/test/CMakeLists.txt
|
|
@@ -5,22 +5,9 @@
|
|
|
|
set(CATCH_CONFIG_FAST_COMPILE ON CACHE BOOL "")
|
|
set(CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT ON CACHE BOOL "")
|
|
-FetchContent_Declare(Catch2
|
|
- GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
|
- GIT_TAG v3.8.1
|
|
- GIT_SHALLOW ON)
|
|
-FetchContent_MakeAvailable(Catch2)
|
|
+find_package(Catch2 REQUIRED)
|
|
include(Catch)
|
|
|
|
-# Build Catch2 in C++17 mode to enable C++17 features
|
|
-target_compile_features(Catch2 PRIVATE cxx_std_17)
|
|
-
|
|
-# Ensure that Catch2 sources and headers are not analyzed by any tools
|
|
-set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF)
|
|
-set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
|
|
-set_target_properties(Catch2 Catch2WithMain PROPERTIES FOLDER "Dependencies")
|
|
-get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES)
|
|
-target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS})
|
|
|
|
add_library(sfml-test-main STATIC
|
|
TestUtilities/SystemUtil.hpp
|