johann/cpu_features
1
0
Fork 0
mirror of https://github.com/google/cpu_features.git synced 2025-04-28 07:23:37 +02:00
Code Issues Releases Wiki Activity

Update googletest management.

Browse Source
This commit is contained in:
Guillaume Chatelet 2018-02-13 10:07:02 +01:00
parent 57917d2b12
commit 9df2d78b8d
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -59,7 +59,8 @@ target_include_directories(cpu_features
include/internal include/internal
) )
set_target_properties(cpu_features PROPERTIES PUBLIC_HEADER "${_HDRS}") set_target_properties(cpu_features PROPERTIES PUBLIC_HEADER "${_HDRS}")
target_compile_definitions(cpu_features PUBLIC STACK_LINE_READER_BUFFER_SIZE=1024) target_compile_definitions(cpu_features
PUBLIC STACK_LINE_READER_BUFFER_SIZE=1024)
target_link_libraries(cpu_features PUBLIC ${CMAKE_DL_LIBS}) target_link_libraries(cpu_features PUBLIC ${CMAKE_DL_LIBS})
# The use of shared libraries is discouraged. # The use of shared libraries is discouraged.
@ -84,8 +85,14 @@ add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features)
include(CTest) include(CTest)
if(BUILD_TESTING) 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. # Download and unpack googletest at configure time.
configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) configure_file(
cmake/googletest.CMakeLists.txt.in
googletest-download/CMakeLists.txt
)
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
@ -105,20 +112,15 @@ if(BUILD_TESTING)
message(FATAL_ERROR "Build step for googletest failed: ${result}") message(FATAL_ERROR "Build step for googletest failed: ${result}")
endif() endif()
# Prevent overriding the parent project's compiler/linker settings on Windows. # Prevent overriding the parent project's compiler/linker settings on
# Windows.
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
# Add googletest directly to our build. This defines the gtest and gtest_main # Add googletest directly to our build. This defines the gtest and
# targets. # gtest_main targets.
add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
${CMAKE_BINARY_DIR}/googletest-build ${CMAKE_BINARY_DIR}/googletest-build
EXCLUDE_FROM_ALL) EXCLUDE_FROM_ALL)
# The gtest/gtest_main targets carry header search path dependencies
# automatically when using CMake 2.8.11 or later. Otherwise we have to add
# them here ourselves.
if (CMAKE_VERSION VERSION_LESS 2.8.11)
include_directories("${gtest_SOURCE_DIR}/include")
endif() endif()
add_subdirectory(test) add_subdirectory(test)

0
CMakeLists.txt.in → cmake/googletest.CMakeLists.txt.in
View File