From 19297f19445552453ca8db468805b3e017f3ad4d Mon Sep 17 00:00:00 2001 From: Anne Marije v/d Meer Date: Sun, 12 Jan 2014 18:16:29 +0100 Subject: [PATCH] Make building the tests optional. Make gtest build with shared crt by defaul. It would be better to do this in one of our own CMakeLists instead of google's but I couldn't figure out how. --- CMakeLists.txt | 9 ++++++++- Sources/Tests/gtest-1.6.0/CMakeLists.txt | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2f8b1fb..62e7398d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,7 @@ endif(PLASMA_TARGETS STREQUAL "Ethereal") option(PLASMA_BUILD_RESOURCE_DAT "Do we want to build resource.dat?" ON) option(PLASMA_BUILD_LAUNCHER "Do we want to build plUruLauncher?" ON) option(PLASMA_BUILD_TOOLS "Do we want to build the Plasma tools?" ON) +<<<<<<< HEAD option(3dsm_BUILD_PLUGIN "Do we want to build the 3ds Max plugin?" OFF) if(3dsm_BUILD_PLUGIN) @@ -103,6 +104,9 @@ if(3dsm_BUILD_PLUGIN) add_definitions(-DBUILDING_MAXPLUGIN) endif(3dsm_BUILD_PLUGIN) +======= +option(PLASMA_BUILD_TESTS "Do we want to build the unit tests?" OFF) +>>>>>>> Make building the tests optional. option(USE_VLD "Build and link with Visual Leak Detector (MSVC only)" OFF) if(USE_VLD) add_definitions(-DUSE_VLD) @@ -128,4 +132,7 @@ include_directories(${OPENSSL_INCLUDE_DIR}) add_subdirectory(Sources/Plasma) add_subdirectory(Sources/Tools) -add_subdirectory(Sources/Tests) \ No newline at end of file + +if(PLASMA_BUILD_TESTS) + add_subdirectory(Sources/Tests) +endif(PLASMA_BUILD_TESTS) diff --git a/Sources/Tests/gtest-1.6.0/CMakeLists.txt b/Sources/Tests/gtest-1.6.0/CMakeLists.txt index 0fe26540..ddd5443b 100644 --- a/Sources/Tests/gtest-1.6.0/CMakeLists.txt +++ b/Sources/Tests/gtest-1.6.0/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)