mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-23 03:05:48 +03:00
d77edd2f59
this commit: * updates to latest master * drop patches that have been upstreamed * make `anbox version` return something sensible * mark me as maintainer as I'm the one maintaining it anyway
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
--- a/external/cpu_features/CMakeLists.txt
|
|
+++ b/external/cpu_features/CMakeLists.txt
|
|
@@ -159,44 +159,6 @@ endif()
|
|
|
|
include(CTest)
|
|
if(BUILD_TESTING)
|
|
- # Automatically incorporate googletest into the CMake Project if target not
|
|
- # found.
|
|
- 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)
|
|
- endif()
|
|
-
|
|
add_subdirectory(test)
|
|
endif()
|
|
|