diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-01-28 17:31:42 -0500 |
|---|---|---|
| committer | Hugo Lindström <hugo.lindstrom@trimble.se> | 2019-01-29 15:00:26 +0100 |
| commit | aafc594a43f1fecbee66edd8d328b30c23aeeaf8 (patch) | |
| tree | 2da04322f005eb0c37df1980e5026413369b11c3 | |
| parent | 987e7f346ad39d7dd70aac0f4ed41a3bba85d829 (diff) | |
| download | googletest-git-aafc594a43f1fecbee66edd8d328b30c23aeeaf8.tar.gz | |
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 8c1f9ba9..ae32b627 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) |