From commits-return-1225-archive-asf-public=cust-asf.ponee.io@parquet.apache.org Sat Feb 10 19:39:47 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 0D64218061A for ; Sat, 10 Feb 2018 19:39:47 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id F0D34160C4D; Sat, 10 Feb 2018 18:39:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 432C6160C3D for ; Sat, 10 Feb 2018 19:39:46 +0100 (CET) Received: (qmail 75688 invoked by uid 500); 10 Feb 2018 18:39:45 -0000 Mailing-List: contact commits-help@parquet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@parquet.apache.org Delivered-To: mailing list commits@parquet.apache.org Received: (qmail 75675 invoked by uid 99); 10 Feb 2018 18:39:45 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Feb 2018 18:39:45 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8C0CC82483; Sat, 10 Feb 2018 18:39:44 +0000 (UTC) Date: Sat, 10 Feb 2018 18:39:44 +0000 To: "commits@parquet.apache.org" Subject: [parquet-cpp] branch master updated: PARQUET-1205: Fix msvc build with static arrow lib MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <151828798444.20974.13275349558344027862@gitbox.apache.org> From: uwe@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: parquet-cpp X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: c064f827e96b37d29ba7a7b87657a18a94896854 X-Git-Newrev: f13c61fd4447bee82ffc5807a03b8ba01960430a X-Git-Rev: f13c61fd4447bee82ffc5807a03b8ba01960430a X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 f13c61f PARQUET-1205: Fix msvc build with static arrow lib f13c61f is described below commit f13c61fd4447bee82ffc5807a03b8ba01960430a Author: revaliu AuthorDate: Sat Feb 10 19:39:34 2018 +0100 PARQUET-1205: Fix msvc build with static arrow lib Author: revaliu Closes #435 from rip-nsk/PARQUET-1205 and squashes the following commits: 60eacb2 [revaliu] allow to use static only arrow library 511b369 [revaliu] boost_static_filesystem is required for static build --- CMakeLists.txt | 4 +++- cmake_modules/FindArrow.cmake | 9 +++++---- cmake_modules/ThirdpartyToolchain.cmake | 6 +++++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ea7ae7..f8fdf32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -494,7 +494,7 @@ else() boost_static_regex) if(MSVC) set(BOOST_LINK_LIBS ${BOOST_LINK_LIBS} - boost_static_system) + boost_static_system boost_static_filesystem) endif() endif() @@ -551,6 +551,8 @@ else() zstd ) + add_definitions(-DARROW_EXPORTING) + set(ARROW_LINK_LIBS arrow_static ${TRANSITIVE_LINK_LIBS}) diff --git a/cmake_modules/FindArrow.cmake b/cmake_modules/FindArrow.cmake index 1ca2736..6af9f88 100644 --- a/cmake_modules/FindArrow.cmake +++ b/cmake_modules/FindArrow.cmake @@ -53,6 +53,10 @@ if ("${ARROW_HOME}" STREQUAL "") else() set(ARROW_HOME "${ARROW_HOME}") + if (MSVC AND NOT ARROW_MSVC_STATIC_LIB_SUFFIX) + set(ARROW_MSVC_STATIC_LIB_SUFFIX _static) + endif() + set(ARROW_SEARCH_HEADER_PATHS ${ARROW_HOME}/include ) @@ -67,7 +71,7 @@ else() NO_DEFAULT_PATH ) - find_library(ARROW_LIB_PATH NAMES arrow + find_library(ARROW_LIB_PATH NAMES arrow arrow${ARROW_MSVC_STATIC_LIB_SUFFIX} PATHS ${ARROW_SEARCH_LIB_PATH} NO_DEFAULT_PATH) @@ -77,9 +81,6 @@ else() set(ARROW_HEADER_NAME arrow/api.h) set(ARROW_HEADER ${ARROW_INCLUDE_DIR}/${ARROW_HEADER_NAME}) set(ARROW_LIB_NAME arrow) - if (MSVC AND NOT ARROW_MSVC_STATIC_LIB_SUFFIX) - set(ARROW_MSVC_STATIC_LIB_SUFFIX _static) - endif() get_filename_component(ARROW_LIBS ${ARROW_LIB_PATH} DIRECTORY) set(ARROW_STATIC_LIB ${ARROW_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ARROW_LIB_NAME}${ARROW_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake index 53a1dc7..b749ab6 100644 --- a/cmake_modules/ThirdpartyToolchain.cmake +++ b/cmake_modules/ThirdpartyToolchain.cmake @@ -91,7 +91,7 @@ else() # Find static Boost libraries. set(Boost_USE_STATIC_LIBS ON) if (MSVC) - find_package(Boost COMPONENTS regex system REQUIRED) + find_package(Boost COMPONENTS regex system filesystem REQUIRED) else() find_package(Boost COMPONENTS regex REQUIRED) endif() @@ -99,11 +99,13 @@ else() set(BOOST_STATIC_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_DEBUG}) if (MSVC) set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG}) + set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG}) endif() else() set(BOOST_STATIC_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_RELEASE}) if (MSVC) set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE}) + set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE}) endif() endif() endif() @@ -130,6 +132,8 @@ else() if (MSVC) add_library(boost_static_system STATIC IMPORTED) set_target_properties(boost_static_system PROPERTIES IMPORTED_LOCATION ${BOOST_STATIC_SYSTEM_LIBRARY}) + add_library(boost_static_filesystem STATIC IMPORTED) + set_target_properties(boost_static_filesystem PROPERTIES IMPORTED_LOCATION ${BOOST_STATIC_FILESYSTEM_LIBRARY}) endif() endif() -- To stop receiving notification emails like this one, please contact uwe@apache.org.