diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-02-08 14:49:03 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-02-08 14:49:03 +0000 |
| commit | 0a430687b8b0ce6b353a953bfe0aa4d4cf4380da (patch) | |
| tree | 559400df3f59cc494b2a065fdd3c10197e18b72b /dev-cpp/scnlib/files | |
| parent | 04b7def847835d8d1eea8f1b418d6988cbd3e9c0 (diff) | |
| download | srcux-0a430687b8b0ce6b353a953bfe0aa4d4cf4380da.tar.gz srcux-0a430687b8b0ce6b353a953bfe0aa4d4cf4380da.tar.xz srcux-0a430687b8b0ce6b353a953bfe0aa4d4cf4380da.zip | |
Adding metadata
Diffstat (limited to 'dev-cpp/scnlib/files')
| -rw-r--r-- | dev-cpp/scnlib/files/scnlib-2.0.0-no-external-test-deps.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/dev-cpp/scnlib/files/scnlib-2.0.0-no-external-test-deps.patch b/dev-cpp/scnlib/files/scnlib-2.0.0-no-external-test-deps.patch new file mode 100644 index 000000000000..e78ba0a2a15d --- /dev/null +++ b/dev-cpp/scnlib/files/scnlib-2.0.0-no-external-test-deps.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index ae2832b..c250eff 100644 +--- a/cmake/dependencies.cmake ++++ b/cmake/dependencies.cmake +@@ -4,41 +4,10 @@ set(SCN_OPTIONAL_DEPENDENCIES "") + + if (SCN_TESTS) + # GTest +- +- FetchContent_Declare( +- googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG main +- GIT_SHALLOW TRUE +- ) +- +- # gtest CMake does some flag overriding we don't want, and it's also quite heavy +- # Do it manually +- +- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +- +- FetchContent_GetProperties(googletest) +- if (NOT googletest) +- FetchContent_Populate(googletest) +- endif () +- +- find_package(Threads) +- +- add_library(scn_gtest +- "${googletest_SOURCE_DIR}/googletest/src/gtest-all.cc" +- "${googletest_SOURCE_DIR}/googlemock/src/gmock-all.cc" +- ) +- target_include_directories(scn_gtest SYSTEM +- PUBLIC +- "${googletest_SOURCE_DIR}/googletest/include" +- "${googletest_SOURCE_DIR}/googlemock/include" +- PRIVATE +- "${googletest_SOURCE_DIR}/googletest" +- "${googletest_SOURCE_DIR}/googlemock" +- ) +- target_link_libraries(scn_gtest PRIVATE Threads::Threads) +- target_compile_features(scn_gtest PUBLIC cxx_std_17) +- target_compile_options(scn_gtest PRIVATE $<$<CXX_COMPILER_ID:GNU>: -Wno-psabi>) ++ find_package(GTest REQUIRED) ++ add_library(scn_gtest INTERFACE) ++ target_link_libraries(scn_gtest INTERFACE GTest::GTest) ++ target_compile_features(scn_gtest INTERFACE cxx_std_17) + endif () + + if (SCN_BENCHMARKS) +@@ -158,8 +127,3 @@ if (SCN_REGEX_BACKEND STREQUAL "re2") + set(SCN_REGEX_BACKEND_TARGET re2::re2) + endif () + +-# make available +- +-FetchContent_MakeAvailable( +- ${SCN_OPTIONAL_DEPENDENCIES} +-) |