Skip to content

Commit 9f7e725

Browse files
committed
try to fix windows ci
1 parent 9f3d4e4 commit 9f7e725

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,11 @@ if("${MAKE}" STREQUAL "")
266266
endif()
267267

268268
# Args for external projects using make.
269-
set(MAKE_BUILD_ARGS "-j${NPROC}")
269+
if(NOT MSVC)
270+
set(MAKE_BUILD_ARGS "-j${NPROC}")
271+
else()
272+
set(MAKE_BUILD_ARGS "")
273+
endif()
270274

271275
include(FetchContent)
272276
set(FC_DECLARE_COMMON_OPTIONS)
@@ -290,8 +294,13 @@ function(build_arrow)
290294
set(ARROW_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/arrow_ep-install")
291295
set(ARROW_HOME "${ARROW_PREFIX}")
292296
set(ARROW_INCLUDE_DIR "${ARROW_PREFIX}/include")
293-
set(ARROW_STATIC_LIB_NAME
294-
"${CMAKE_STATIC_LIBRARY_PREFIX}arrow${CMAKE_STATIC_LIBRARY_SUFFIX}")
297+
if(MSVC_TOOLCHAIN)
298+
set(ARROW_STATIC_LIB_NAME
299+
"${CMAKE_STATIC_LIBRARY_PREFIX}arrow_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
300+
else()
301+
set(ARROW_STATIC_LIB_NAME
302+
"${CMAKE_STATIC_LIBRARY_PREFIX}arrow${CMAKE_STATIC_LIBRARY_SUFFIX}")
303+
endif()
295304
set(ARROW_STATIC_LIB "${ARROW_PREFIX}/lib/${ARROW_STATIC_LIB_NAME}")
296305

297306
set(ARROW_CMAKE_ARGS

0 commit comments

Comments
 (0)