OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Make building the tests optional.

Browse Source 
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.
This commit is contained in:
Anne Marije v/d Meer
2014-01-12 18:16:29 +01:00
parent 7bde88a635
commit 19297f1944
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -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_RESOURCE_DAT "Do we want to build resource.dat?" ON)
option(PLASMA_BUILD_LAUNCHER "Do we want to build plUruLauncher?" 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) 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) option(3dsm_BUILD_PLUGIN "Do we want to build the 3ds Max plugin?" OFF)
if(3dsm_BUILD_PLUGIN) if(3dsm_BUILD_PLUGIN)
@ -103,6 +104,9 @@ if(3dsm_BUILD_PLUGIN)
add_definitions(-DBUILDING_MAXPLUGIN) add_definitions(-DBUILDING_MAXPLUGIN)
endif(3dsm_BUILD_PLUGIN) 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) option(USE_VLD "Build and link with Visual Leak Detector (MSVC only)" OFF)
if(USE_VLD) if(USE_VLD)
add_definitions(-DUSE_VLD) add_definitions(-DUSE_VLD)
@ -128,4 +132,7 @@ include_directories(${OPENSSL_INCLUDE_DIR})
add_subdirectory(Sources/Plasma) add_subdirectory(Sources/Plasma)
add_subdirectory(Sources/Tools) add_subdirectory(Sources/Tools)
add_subdirectory(Sources/Tests)
if(PLASMA_BUILD_TESTS)
add_subdirectory(Sources/Tests)
endif(PLASMA_BUILD_TESTS)

2
Sources/Tests/gtest-1.6.0/CMakeLists.txt
View File

@ -14,7 +14,7 @@ option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
option( option(
gtest_force_shared_crt gtest_force_shared_crt
"Use shared (DLL) run-time lib even when Google Test is built as static lib." "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) option(gtest_build_tests "Build all of gtest's own tests." OFF)