diff options
| author | CoprDistGit <infra@openeuler.org> | 2025-01-14 07:53:57 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2025-01-14 07:53:57 +0000 |
| commit | 1bf1e59cec68cc5f0a8e366f598cd5d5f84684b1 (patch) | |
| tree | 3dae33ac499baea2a34bb85439155b9fc9718521 /google-cpu_features-unbundle_gtest.patch | |
| parent | 2d9df3009a7d61447075899721e148b89cc25cf8 (diff) | |
automatic import of google-cpu_featuresopeneuler24.09
Diffstat (limited to 'google-cpu_features-unbundle_gtest.patch')
| -rw-r--r-- | google-cpu_features-unbundle_gtest.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/google-cpu_features-unbundle_gtest.patch b/google-cpu_features-unbundle_gtest.patch new file mode 100644 index 0000000..468cb39 --- /dev/null +++ b/google-cpu_features-unbundle_gtest.patch @@ -0,0 +1,45 @@ +From https://src.fedoraproject.org/rpms/google-cpu_features/blob/rawhide/f/google-cpu_features-unbundle_gtest.patch + +--- cpu_features-0.9.0.old/CMakeLists.txt 2023-09-14 13:15:33.000000000 +0100 ++++ cpu_features-0.9.0.new/CMakeLists.txt 2024-03-25 09:46:42.619143407 +0000 +@@ -215,39 +215,7 @@ + set(CMAKE_CXX_EXTENSIONS OFF) # prefer use of -std14 instead of -gnustd14 + + if(NOT TARGET gtest OR NOT TARGET gmock_main) +- # Download and unpack googletest at configure time. +- configure_file( +- cmake/googletest.CMakeLists.txt.in +- googletest-download/CMakeLists.txt +- ) +- +- execute_process( +- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . +- RESULT_VARIABLE result +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download) +- +- if(result) +- message(FATAL_ERROR "CMake step for googletest failed: ${result}") +- endif() +- +- execute_process( +- COMMAND ${CMAKE_COMMAND} --build . +- RESULT_VARIABLE result +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download) +- +- if(result) +- message(FATAL_ERROR "Build step for googletest failed: ${result}") +- endif() +- +- # Prevent overriding the parent project's compiler/linker settings on +- # Windows. +- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +- +- # Add googletest directly to our build. This defines the gtest and +- # gtest_main targets. +- add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src +- ${CMAKE_BINARY_DIR}/googletest-build +- EXCLUDE_FROM_ALL) ++ find_package(GTest) + endif() + + add_subdirectory(test) |