[
https://issues.apache.org/jira/browse/ARROW-2258?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16386147#comment-16386147
]
ASF GitHub Bot commented on ARROW-2258:
---------------------------------------
wesm closed pull request #1700: ARROW-2258: [Python] Add additional information
to find Boost on windows
URL: https://github.com/apache/arrow/pull/1700
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ci/msvc-build.bat b/ci/msvc-build.bat
index b6f672da9..beefee6c0 100644
--- a/ci/msvc-build.bat
+++ b/ci/msvc-build.bat
@@ -133,7 +133,7 @@ popd
pushd python
set PYARROW_CXXFLAGS=/WX
-python setup.py build_ext --with-parquet --bundle-arrow-cpp ^
+python setup.py build_ext --with-parquet --bundle-arrow-cpp
--with-static-boost ^
install -q --single-version-externally-managed --record=record.text ^
bdist_wheel || exit /B
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 72294d494..d17194628 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -268,6 +268,24 @@ if (PYARROW_BUNDLE_ARROW_CPP)
# boost
if (PYARROW_BOOST_USE_SHARED)
set(Boost_USE_STATIC_LIBS OFF)
+ set(Boost_USE_MULTITHREADED ON)
+ if (MSVC AND ARROW_USE_STATIC_CRT)
+ set(Boost_USE_STATIC_RUNTIME ON)
+ endif()
+ set(Boost_ADDITIONAL_VERSIONS
+ "1.66.0" "1.66"
+ "1.65.0" "1.65"
+ "1.64.0" "1.64"
+ "1.63.0" "1.63"
+ "1.62.0" "1.61"
+ "1.61.0" "1.62"
+ "1.60.0" "1.60")
+ list(GET Boost_ADDITIONAL_VERSIONS 0 BOOST_LATEST_VERSION)
+ string(REPLACE "." "_" BOOST_LATEST_VERSION_IN_PATH
${BOOST_LATEST_VERSION})
+ if (MSVC)
+ # disable autolinking in boost
+ add_definitions(-DBOOST_ALL_NO_LIB)
+ endif()
find_package(Boost COMPONENTS system filesystem regex REQUIRED)
bundle_boost_lib(Boost_REGEX_LIBRARY)
bundle_boost_lib(Boost_FILESYSTEM_LIBRARY)
diff --git a/python/setup.py b/python/setup.py
index 34d2d9079..ddf7cc55a 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -96,6 +96,7 @@ def run(self):
('build-type=', None, 'build type (debug or release)'),
('with-parquet', None, 'build the Parquet extension'),
('with-static-parquet', None, 'link parquet statically'),
+ ('with-static-boost', None, 'link boost statically'),
('with-plasma', None, 'build the Plasma extension'),
('with-orc', None, 'build the ORC extension'),
('bundle-arrow-cpp', None,
@@ -170,6 +171,8 @@ def _run_cmake(self):
cmake_options.append('-DPYARROW_PARQUET_USE_SHARED=off')
if not self.with_static_boost:
cmake_options.append('-DPYARROW_BOOST_USE_SHARED=on')
+ else:
+ cmake_options.append('-DPYARROW_BOOST_USE_SHARED=off')
if self.with_plasma:
cmake_options.append('-DPYARROW_BUILD_PLASMA=on')
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> [C++] Appveyor builds failing on master
> ---------------------------------------
>
> Key: ARROW-2258
> URL: https://issues.apache.org/jira/browse/ARROW-2258
> Project: Apache Arrow
> Issue Type: Bug
> Components: C++
> Reporter: Wes McKinney
> Priority: Blocker
> Labels: pull-request-available
> Fix For: 0.9.0
>
>
> See
> https://ci.appveyor.com/project/ApacheSoftwareFoundation/arrow/build/1.0.5563
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
