From 06941c6dcdf0d9da80e3e31ba6708054583f9bfc Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Fri, 14 Oct 2016 20:54:15 -0700 Subject: revert 1858ac9b42c167ab6d89b929c075872d740eb0b5 This commit in google's protocol buffers tree breaks the link options for windows when linking with apitrace Author: Jan Tattermusch make VS build link runtime statically --- thirdparty/protobuf/cmake/CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) (limited to 'thirdparty') 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) -- cgit v1.2.3