From a1485f6471ac2567f76a7f33e032c9bef8a0e412 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 27 Mar 2024 18:42:30 +0000 Subject: Adding metadata --- .../files/scnlib-2.0.0-no-external-test-deps.patch | 59 ---------------------- .../files/scnlib-2.0.2-accept-newer-simdutf.patch | 16 ++++++ .../files/scnlib-2.0.2-no-external-test-deps.patch | 59 ++++++++++++++++++++++ 3 files changed, 75 insertions(+), 59 deletions(-) delete mode 100644 dev-cpp/scnlib/files/scnlib-2.0.0-no-external-test-deps.patch create mode 100644 dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch create mode 100644 dev-cpp/scnlib/files/scnlib-2.0.2-no-external-test-deps.patch (limited to 'dev-cpp/scnlib/files') 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 deleted file mode 100644 index e78ba0a2a15d..000000000000 --- a/dev-cpp/scnlib/files/scnlib-2.0.0-no-external-test-deps.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 $<$: -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} --) diff --git a/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch b/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch new file mode 100644 index 000000000000..3e42ae495a68 --- /dev/null +++ b/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index ae2832b..186fbed 100644 +--- a/cmake/dependencies.cmake ++++ b/cmake/dependencies.cmake +@@ -61,7 +61,10 @@ endif () + # we don't want to include tests of dependencies, so we need to do some manual work + + if (SCN_USE_EXTERNAL_SIMDUTF) +- find_package(simdutf 4.0.0 CONFIG REQUIRED) ++ find_package(simdutf 5.0.0 CONFIG) ++ if(NOT simdutf_FOUND) ++ find_package(simdutf 4.0.0 CONFIG REQUIRED) ++ endif() + else () + FetchContent_Declare( + simdutf diff --git a/dev-cpp/scnlib/files/scnlib-2.0.2-no-external-test-deps.patch b/dev-cpp/scnlib/files/scnlib-2.0.2-no-external-test-deps.patch new file mode 100644 index 000000000000..e78ba0a2a15d --- /dev/null +++ b/dev-cpp/scnlib/files/scnlib-2.0.2-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 $<$: -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} +-) -- cgit v1.3