External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop gmock from conflicting.

Browse Source
This commit is contained in:
Kevin Dade 2019-08-28 13:24:32 -07:00
parent 921276ba36
commit 582cbe9369
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/CMakeLists.txt
View File

@ -7,6 +7,7 @@ if(MSVC)
set(CMAKE_STATIC_LIBRARY_PREFIX "") set(CMAKE_STATIC_LIBRARY_PREFIX "")
endif() endif()
if (NOT TARGET gmock)
ExternalProject_Add( ExternalProject_Add(
googletest_project googletest_project
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.8.0" SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.8.0"
@ -18,10 +19,12 @@ ExternalProject_Add(
) )
add_library(gmock UNKNOWN IMPORTED) add_library(gmock UNKNOWN IMPORTED)
add_dependencies(gmock googletest_project)
set_target_properties(gmock PROPERTIES set_target_properties(gmock PROPERTIES
IMPORTED_LOCATION IMPORTED_LOCATION
${PROJECT_BINARY_DIR}/test/prefix/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX} ${PROJECT_BINARY_DIR}/test/prefix/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}
) )
endif()
find_package(Threads) find_package(Threads)
@ -51,7 +54,7 @@ add_executable(run-tests
${test_headers} ${test_headers}
) )
add_dependencies(run-tests googletest_project) add_dependencies(run-tests gmock)
set_target_properties(run-tests PROPERTIES set_target_properties(run-tests PROPERTIES
COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags} ${yaml_test_flags}" COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags} ${yaml_test_flags}"