This is an automated email from the ASF dual-hosted git repository.
uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 57563cd ARROW-2109: [C++] Completely disable boost autolink on MSVC
build
57563cd is described below
commit 57563cd7a85f89094405d705232693fe4a78344b
Author: Max Risuhin <[email protected]>
AuthorDate: Wed Feb 7 15:28:41 2018 +0100
ARROW-2109: [C++] Completely disable boost autolink on MSVC build
Boost's autolink disabling solves linkage issues appeared with boost
v.1.66.0 (in case of linkage with static boost libs)
Author: Max Risuhin <[email protected]>
Closes #1567 from MaxRis/ARROW-2109 and squashes the following commits:
bf5dcef [Max Risuhin] ARROW-2109: [C++] Completely disable boost autolink
on MSVC build
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 69812b9..374c652 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -136,6 +136,7 @@ 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"
@@ -192,14 +193,15 @@ if (ARROW_BOOST_VENDORED)
set(Boost_INCLUDE_DIRS "${BOOST_INCLUDE_DIR}")
add_dependencies(arrow_dependencies boost_ep)
else()
+ if (MSVC)
+ # disable autolinking in boost
+ add_definitions(-DBOOST_ALL_NO_LIB)
+ endif()
if (ARROW_BOOST_USE_SHARED)
# Find shared Boost libraries.
set(Boost_USE_STATIC_LIBS OFF)
- if(MSVC)
- # disable autolinking in boost
- add_definitions(-DBOOST_ALL_NO_LIB)
-
+ if (MSVC)
# force all boost libraries to dynamic link
add_definitions(-DBOOST_ALL_DYN_LINK)
endif()
--
To stop receiving notification emails like this one, please contact
[email protected].
