Skip to content

Commit a82647b

Browse files
committed
Fix build with MSVC
1 parent c045ed4 commit a82647b

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES
1010
set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-Wa,-mbig-obj")
1111
endif ()
1212
else ()
13+
set (COMMON_MSVC_OPTS "/wd4503 /DBOOST_ALL_NO_LIB")
14+
1315
# MSVC
1416
if (NOT DEFINED MSVC_RUNTIME_TYPE)
1517
set (MSVC_RUNTIME_TYPE "/MD")
18+
set (gtest_force_shared_crt ON CACHE BOOL "" FORCE)
1619
endif ()
1720
if (CMAKE_BUILD_TYPE MATCHES "Debug")
18-
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_RUNTIME_TYPE}d")
21+
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_RUNTIME_TYPE}d ${COMMON_MSVC_OPTS}")
1922
set (Boost_USE_DEBUG_RUNTIME ON)
2023
else ()
21-
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MSVC_RUNTIME_TYPE}")
22-
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${MSVC_RUNTIME_TYPE}")
24+
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MSVC_RUNTIME_TYPE} ${COMMON_MSVC_OPTS}")
25+
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${MSVC_RUNTIME_TYPE} ${COMMON_MSVC_OPTS}")
2326
set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/PROFILE")
2427
set (Boost_USE_DEBUG_RUNTIME OFF)
2528
endif ()
29+
2630
endif()
2731

2832
set(BOOST_CMAKE_LIBRARIES filesystem algorithm variant optional CACHE INTERNAL "")

0 commit comments

Comments
 (0)