File tree Expand file tree Collapse file tree 4 files changed +24
-6
lines changed Expand file tree Collapse file tree 4 files changed +24
-6
lines changed Original file line number Diff line number Diff line change @@ -31,8 +31,9 @@ ExternalProject_Add(abseil
3131 -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
3232 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
3333 -DCMAKE_INSTALL_MESSAGE=LAZY
34- -DBUILD_SHARED_LIBS:BOOL =${BUILD_SHARED_LIBS}
35- -DCMAKE_MSVC_RUNTIME_LIBRARY:STRING =${CMAKE_MSVC_RUNTIME_LIBRARY}
34+ -DBUILD_SHARED_LIBS:BOOL =${BUILD_SHARED_LIBS}
35+ -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
36+ -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
3637 -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL =ON
3738 -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
3839 -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
Original file line number Diff line number Diff line change @@ -31,8 +31,9 @@ ExternalProject_Add(asyncplusplus
3131 -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
3232 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
3333 -DCMAKE_INSTALL_MESSAGE=LAZY
34- -DBUILD_SHARED_LIBS:BOOL =${BUILD_SHARED_LIBS}
35- -DCMAKE_MSVC_RUNTIME_LIBRARY:STRING =${CMAKE_MSVC_RUNTIME_LIBRARY}
34+ -DBUILD_SHARED_LIBS:BOOL =${BUILD_SHARED_LIBS}
35+ -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
36+ -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
3637 -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL =ON
3738 -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
3839 CMAKE_CACHE_ARGS
Original file line number Diff line number Diff line change @@ -22,6 +22,15 @@ if(NOT CPACK_PACKAGE_VERSION)
2222 set (CPACK_PACKAGE_VERSION "master" )
2323endif ()
2424
25+ if (WIN32 )
26+ if (CMAKE_C_FLAGS_DEBUG)
27+ string (REPLACE "/MDd" "/MD" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG} )
28+ endif ()
29+ if (CMAKE_CXX_FLAGS_DEBUG )
30+ string (REPLACE "/MDd" "/MD" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG} )
31+ endif ()
32+ endif ()
33+
2534if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES )
2635 message (STATUS "Setting build type to 'Release' as none was specified." )
2736 set (CMAKE_BUILD_TYPE "Release" CACHE STRING
@@ -34,7 +43,6 @@ endif()
3443if ("${CMAKE_CXX_STANDARD} " STREQUAL "" )
3544 set (CMAKE_CXX_STANDARD 11)
3645endif ()
37- set (CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" )
3846
3947# Begin configuration of the superbuild project
4048project (SuperBuild NONE)
Original file line number Diff line number Diff line change @@ -55,7 +55,15 @@ if(NOT BUILD_SHARED_LIBS)
5555 $<$<CXX_COMPILER_ID:MSVC >:/INCREMENTAL:NO >
5656 )
5757endif ()
58- set (CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" )
58+
59+ if (WIN32 )
60+ if (CMAKE_C_FLAGS_DEBUG)
61+ string (REPLACE "/MDd" "/MD" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG} )
62+ endif ()
63+ if (CMAKE_CXX_FLAGS_DEBUG )
64+ string (REPLACE "/MDd" "/MD" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG} )
65+ endif ()
66+ endif ()
5967
6068#------------------------------------------------------------------------------------------------
6169# Install configuration
You can’t perform that action at this time.
0 commit comments