Skip to content

Commit d9e4b1b

Browse files
committed
Only use /nodefaultlib:libcmt if arrow_use_static_crt=OFF
Change-Id: I3789c1226086df9f25db8d3f05fd58168f4da151
1 parent a8f960d commit d9e4b1b

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

cpp/cmake_modules/SetupCxxFlags.cmake

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -420,11 +420,13 @@ if (MSVC)
420420
if (MSVC_LINK_VERBOSE)
421421
set(MSVC_LINKER_FLAGS "${MSVC_LINKER_FLAGS} /VERBOSE:LIB")
422422
endif()
423-
set(MSVC_LINKER_FLAGS "${MSVC_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
424-
set(CMAKE_EXE_LINKER_FLAGS
425-
"${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LINKER_FLAGS}")
426-
set(CMAKE_MODULE_LINKER_FLAGS
427-
"${CMAKE_MODULE_LINKER_FLAGS} ${MSVC_LINKER_FLAGS}")
428-
set(CMAKE_SHARED_LINKER_FLAGS
429-
"${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_LINKER_FLAGS}")
423+
if (NOT ARROW_USE_STATIC_CRT)
424+
set(MSVC_LINKER_FLAGS "${MSVC_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
425+
set(CMAKE_EXE_LINKER_FLAGS
426+
"${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LINKER_FLAGS}")
427+
set(CMAKE_MODULE_LINKER_FLAGS
428+
"${CMAKE_MODULE_LINKER_FLAGS} ${MSVC_LINKER_FLAGS}")
429+
set(CMAKE_SHARED_LINKER_FLAGS
430+
"${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_LINKER_FLAGS}")
431+
endif()
430432
endif()

0 commit comments

Comments
 (0)