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/parquet-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new a9fdeb0 PARQUET-1210: [C++] Completely disable boost autolink on MSVC
build
a9fdeb0 is described below
commit a9fdeb0b1f2105290a88246c7a7fd8717751200a
Author: Max Risuhin <[email protected]>
AuthorDate: Tue Feb 13 16:06:25 2018 +0100
PARQUET-1210: [C++] Completely disable boost autolink on MSVC build
Author: Max Risuhin <[email protected]>
Closes #437 from MaxRis/PARQUET-1210 and squashes the following commits:
04a58a1 [Max Risuhin] PARQUET-1210: [C++] Completely disable boost autolink
on MSVC build
---
cmake_modules/ThirdpartyToolchain.cmake | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/cmake_modules/ThirdpartyToolchain.cmake
b/cmake_modules/ThirdpartyToolchain.cmake
index b749ab6..08b2a4c 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -61,14 +61,15 @@ set(Boost_USE_MULTITHREADED ON)
if (MSVC AND PARQUET_USE_STATIC_CRT)
set(Boost_USE_STATIC_RUNTIME ON)
endif()
+if (MSVC)
+ # disable autolinking in boost
+ add_definitions(-DBOOST_ALL_NO_LIB)
+endif()
if (PARQUET_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)
-
# force all boost libraries to dynamic link
add_definitions(-DBOOST_ALL_DYN_LINK)
find_package(Boost COMPONENTS regex system REQUIRED)
--
To stop receiving notification emails like this one, please contact
[email protected].
