From 79226fe7037a3c50e354d79eff46be0e59632ccf Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Thu, 1 May 2014 20:06:19 -0700 Subject: [PATCH] Use DLL runtime for gtest. --- CMakeLists.txt | 4 ++-- gtest/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30983de1..f9735ead 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,8 +50,6 @@ endif () add_subdirectory(doc) -enable_testing() - add_test(compile-test ${CMAKE_CTEST_COMMAND} --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/test" @@ -81,6 +79,8 @@ if (HAVE_DUP) add_definitions(-DFMT_USE_DUP=1) endif () +enable_testing() + include_directories(.) add_executable(format-test test/format-test.cc) target_link_libraries(format-test format gtest) diff --git a/gtest/CMakeLists.txt b/gtest/CMakeLists.txt index 93341380..d1961203 100644 --- a/gtest/CMakeLists.txt +++ b/gtest/CMakeLists.txt @@ -14,7 +14,7 @@ option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF) option( gtest_force_shared_crt "Use shared (DLL) run-time lib even when Google Test is built as static lib." - OFF) + ON) option(gtest_build_tests "Build all of gtest's own tests." OFF)