luo980/yaml-cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from swift-nav/kdade/make-0.6.2-update-work

Browse Source 
Stop gmock from conflicting.
This commit is contained in:
Kevin Dade 2019-08-28 13:34:40 -07:00 committed by GitHub
commit fe067081c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 "")
endif()
if (NOT TARGET gmock)
ExternalProject_Add(
googletest_project
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.8.0"
@ -18,10 +19,12 @@ ExternalProject_Add(
)
add_library(gmock UNKNOWN IMPORTED)
add_dependencies(gmock googletest_project)
set_target_properties(gmock PROPERTIES
IMPORTED_LOCATION
${PROJECT_BINARY_DIR}/test/prefix/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}
)
endif()
find_package(Threads)
@ -51,7 +54,7 @@ add_executable(run-tests
${test_headers}
)
add_dependencies(run-tests googletest_project)
add_dependencies(run-tests gmock)
set_target_properties(run-tests PROPERTIES
COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags} ${yaml_test_flags}"