kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1699

Browse source 
dd348549 make previous change portable (Timothy D. Prime)
32d7d048 fixes #1688 protect make debug-test from gtest (Timothy D. Prime)
This commit is contained in:
Riccardo Spagni 2017-02-12 23:19:33 +02:00
commit 71770d1a78
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tests/CMakeLists.txt
View file

@ -43,24 +43,30 @@ if (GTest_FOUND)
include_directories(SYSTEM ${GTEST_INCLUDE_DIRS}) include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
else () else ()
message(STATUS "GTest not found on the system: will use GTest bundled with this source") message(STATUS "GTest not found on the system: will use GTest bundled with this source")
add_subdirectory(gtest)
include_directories(SYSTEM "${gtest_SOURCE_DIR}/include" "${gtest_SOURCE_DIR}") include(ExternalProject)
ExternalProject_Add(googletest
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gtest
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gtest
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
INSTALL_COMMAND ""
)
add_library(gtest UNKNOWN IMPORTED)
add_library(gtest_main UNKNOWN IMPORTED)
set_target_properties(gtest PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/gtest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
set_target_properties(gtest_main PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/gtest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
add_dependencies(gtest googletest)
add_dependencies(gtest_main googletest)
# Emulate the FindGTest module's variable. # Emulate the FindGTest module's variable.
set(GTEST_LIBRARIES gtest) set(GTEST_LIBRARIES gtest gtest_main)
include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/gtest/include")
# Ignore some warnings when building gtest binaries. endif (GTest_FOUND)
if(NOT MSVC)
set_property(TARGET gtest
APPEND_STRING
PROPERTY
COMPILE_FLAGS " -Wno-undef -Wno-sign-compare")
endif()
set_property(TARGET gtest
PROPERTY
FOLDER "${folder}")
endif ()
file(COPY file(COPY
data/wallet_9svHk1.keys data/wallet_9svHk1.keys