diff options
| author | Mark Janes <mark.a.janes@intel.com> | 2016-10-14 20:54:15 -0700 |
|---|---|---|
| committer | Mark Janes <mark.a.janes@intel.com> | 2017-06-19 14:04:49 -0700 |
| commit | 06941c6dcdf0d9da80e3e31ba6708054583f9bfc (patch) | |
| tree | 594a825426f7e6c4bbd638d9823547a0585d2f1f | |
| parent | e29582e1099a8d60c0953b697c41c0f6f306143a (diff) | |
This commit in google's protocol buffers tree breaks the link options
for windows when linking with apitrace
Author: Jan Tattermusch <jtattermusch@google.com>
make VS build link runtime statically
| -rw-r--r-- | thirdparty/protobuf/cmake/CMakeLists.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/thirdparty/protobuf/cmake/CMakeLists.txt b/thirdparty/protobuf/cmake/CMakeLists.txt index df3b2012..be984bd3 100644 --- a/thirdparty/protobuf/cmake/CMakeLists.txt +++ b/thirdparty/protobuf/cmake/CMakeLists.txt @@ -122,13 +122,6 @@ else (protobuf_BUILD_SHARED_LIBS) # This is achieved by replacing msvc option /MD with /MT and /MDd with /MTd # http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F if (MSVC AND protobuf_MSVC_STATIC_RUNTIME) - foreach(flag_var - CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE - CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) - if(${flag_var} MATCHES "/MD") - string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") - endif(${flag_var} MATCHES "/MD") - endforeach(flag_var) endif (MSVC AND protobuf_MSVC_STATIC_RUNTIME) endif (protobuf_BUILD_SHARED_LIBS) |