diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-05-18 21:08:05 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-05-18 21:08:05 +0000 |
| commit | 3232e6797752028fabe8daddd212e52f0ea76ee6 (patch) | |
| tree | 5b2ff1d3b9d0a4b9ad1b1bfb0bd59be180e4a52b /cmake | |
| parent | c3ad69057c28427c2a000a462468b34883853c6e (diff) | |
| download | googletest-3232e6797752028fabe8daddd212e52f0ea76ee6.tar.gz | |
Introduces gtest_force_shared_crt option for CMake build scripts.
git-svn-id: http://googletest.googlecode.com/svn/trunk@434 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/internal_utils.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/internal_utils.cmake b/cmake/internal_utils.cmake index c611025..01dda3f 100644 --- a/cmake/internal_utils.cmake +++ b/cmake/internal_utils.cmake @@ -15,7 +15,7 @@ macro(fix_default_settings) foreach (flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) - if (NOT BUILD_SHARED_LIBS) + if (NOT BUILD_SHARED_LIBS AND NOT gtest_force_shared_crt) # When Google Test is built as a shared library, it should also use # shared runtime libraries. Otherwise, it may end up with multiple # copies of runtime library data in different modules, resulting in |