diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-01-28 17:31:42 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-01-28 17:31:42 -0500 |
| commit | 01148677a937eae1c0fd1e488ca81445531ea368 (patch) | |
| tree | 44f82d4eda56f26b69413460a64a420878fa6037 | |
| parent | 5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081 (diff) | |
| parent | 718bb65acff116074eaafcaeb57600952ea61def (diff) | |
| download | googletest-01148677a937eae1c0fd1e488ca81445531ea368.tar.gz googletest-01148677a937eae1c0fd1e488ca81445531ea368.tar.bz2 googletest-01148677a937eae1c0fd1e488ca81445531ea368.zip | |
Merge pull request #2086 from hugolm84:fix-dynamic/static-runtime-link
PiperOrigin-RevId: 231286700
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 99725b73..489223a7 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -22,6 +22,8 @@ macro(fix_default_compiler_settings_) # This replacement code is taken from sample in the CMake Wiki at # https://gitlab.kitware.com/cmake/community/wikis/FAQ#dynamic-replace. foreach (flag_var + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) if (NOT BUILD_SHARED_LIBS AND NOT gtest_force_shared_crt) |