diff options
| author | Marat Dukhan <maratek@gmail.com> | 2018-06-23 01:03:14 -0700 |
|---|---|---|
| committer | Marat Dukhan <maratek@gmail.com> | 2018-06-23 01:03:14 -0700 |
| commit | d4e629941177205582254c70e2d981624cef69eb (patch) | |
| tree | 309433f369262fa5cc29524b2ed8c5dd79e73546 | |
| parent | fde5f73756eba3c67916173011d0bb1d28c130d2 (diff) | |
| download | cpuinfo-d4e629941177205582254c70e2d981624cef69eb.tar.gz | |
Fix CMake configuration for clog unit test
| -rw-r--r-- | deps/clog/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | deps/clog/cmake/DownloadGoogleTest.cmake | 15 |
2 files changed, 27 insertions, 2 deletions
diff --git a/deps/clog/CMakeLists.txt b/deps/clog/CMakeLists.txt index 9b1e091..083f519 100644 --- a/deps/clog/CMakeLists.txt +++ b/deps/clog/CMakeLists.txt @@ -73,12 +73,22 @@ INSTALL(TARGETS clog PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") # ---[ clog tests -IF(CLOG_BUILD_UNIT_TESTS) +IF(CLOG_BUILD_TESTS) + # ---[ Build google test + IF(NOT TARGET gtest) + IF(MSVC AND NOT CLOG_RUNTIME_TYPE STREQUAL "static") + SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + ENDIF() + ADD_SUBDIRECTORY( + "${GOOGLETEST_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest") + ENDIF() + ADD_EXECUTABLE(clog-test test/clog.cc) SET_TARGET_PROPERTIES(clog-test PROPERTIES CXX_STANDARD 11 CXX_EXTENSIONS NO) CLOG_TARGET_RUNTIME_LIBRARY(clog-test) - TARGET_LINK_LIBRARIES(clog-test PRIVATE clog gtest) + TARGET_LINK_LIBRARIES(clog-test PRIVATE clog gtest gtest_main) ADD_TEST(clog-test clog-test) ENDIF() diff --git a/deps/clog/cmake/DownloadGoogleTest.cmake b/deps/clog/cmake/DownloadGoogleTest.cmake new file mode 100644 index 0000000..d69d19a --- /dev/null +++ b/deps/clog/cmake/DownloadGoogleTest.cmake @@ -0,0 +1,15 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR) + +PROJECT(googletest-download NONE) + +INCLUDE(ExternalProject) +ExternalProject_Add(googletest + URL https://github.com/google/googletest/archive/release-1.8.0.zip + URL_HASH SHA256=f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf + SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest" + BINARY_DIR "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" +) |