mirror of
https://github.com/apache/arrow.git
synced 2026-10-29 09:05:47 +08:00
Disable static CRT build
This commit is contained in:
1 parent
c83c7d6330
commit
ac73ae370a
3 files changed
+8
-3
No files matched your search
+3
-2
@@ -66,8 +66,9 @@ environment:
|
||||
GENERATOR: Visual Studio 14 2015 Win64
|
||||
CONFIGURATION: "Release"
|
||||
ARROW_BUILD_GANDIVA: "ON"
|
||||
- JOB: "Static_Crt_Build"
|
||||
GENERATOR: Ninja
|
||||
# NOTE: Since ARROW-5403 we have disabled the static CRT build
|
||||
# - JOB: "Static_Crt_Build"
|
||||
# GENERATOR: Ninja
|
||||
- JOB: "Build_Debug"
|
||||
GENERATOR: Ninja
|
||||
CONFIGURATION: "Debug"
|
||||
|
||||
@@ -26,6 +26,10 @@ if "%JOB%" == "Static_Crt_Build" (
|
||||
@rem the Arrow DLL and the tests end up using a different instance of
|
||||
@rem the CRT, which wreaks havoc.
|
||||
|
||||
@rem ARROW-5403(wesm): Since changing to using gtest DLLs we can no
|
||||
@rem longer run the unit tests because gtest.dll and the unit test
|
||||
@rem executables have different static copies of the CRT
|
||||
|
||||
mkdir cpp\build-debug
|
||||
pushd cpp\build-debug
|
||||
|
||||
|
||||
@@ -179,7 +179,7 @@ function(ADD_ARROW_LIB LIB_NAME)
|
||||
else()
|
||||
# Otherwise, generate a single "objlib" from all C++ modules and link
|
||||
# that "objlib" into each library kind, to avoid compiling twice
|
||||
add_library(${LIB_NAME}_objlib ${ARG_SOURCES} OBJECT)
|
||||
add_library(${LIB_NAME}_objlib OBJECT ${ARG_SOURCES})
|
||||
# Necessary to make static linking into other shared libraries work properly
|
||||
set_property(TARGET ${LIB_NAME}_objlib PROPERTY POSITION_INDEPENDENT_CODE 1)
|
||||
if(ARG_DEPENDENCIES)
|
||||
|
||||
Reference in new issue
Block a user