Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B2405200CD1 for ; Wed, 26 Jul 2017 18:06:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B0DDA169102; Wed, 26 Jul 2017 16:06:28 +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 04583169100 for ; Wed, 26 Jul 2017 18:06:27 +0200 (CEST) Received: (qmail 87230 invoked by uid 500); 26 Jul 2017 16:06:27 -0000 Mailing-List: contact commits-help@arrow.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@arrow.apache.org Delivered-To: mailing list commits@arrow.apache.org Received: (qmail 87221 invoked by uid 99); 26 Jul 2017 16:06:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jul 2017 16:06:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0843AE00C5; Wed, 26 Jul 2017 16:06:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wesm@apache.org To: commits@arrow.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: arrow git commit: ARROW-1275: [C++] Deafult Snappy static lib suffix updated to "_static" Date: Wed, 26 Jul 2017 16:06:27 +0000 (UTC) archived-at: Wed, 26 Jul 2017 16:06:28 -0000 Repository: arrow Updated Branches: refs/heads/master 5708cd103 -> dca5d96c7 ARROW-1275: [C++] Deafult Snappy static lib suffix updated to "_static" Author: Max Risuhin Closes #894 from MaxRis/ARROW-1275 and squashes the following commits: 3dcf216 [Max Risuhin] ARROW-1275: [C++] Deafult Snappy static lib suffix updated to "_static" Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/dca5d96c Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/dca5d96c Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/dca5d96c Branch: refs/heads/master Commit: dca5d96c7a029c079183e2903db425e486e2deb9 Parents: 5708cd1 Author: Max Risuhin Authored: Wed Jul 26 12:06:21 2017 -0400 Committer: Wes McKinney Committed: Wed Jul 26 12:06:21 2017 -0400 ---------------------------------------------------------------------- cpp/CMakeLists.txt | 2 +- cpp/cmake_modules/SnappyCMakeLists.txt | 6 +++--- cpp/cmake_modules/ThirdpartyToolchain.cmake | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/dca5d96c/cpp/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 41af1e1..1e9aef0 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -165,7 +165,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") if (MSVC) set(BROTLI_MSVC_STATIC_LIB_SUFFIX "_static" CACHE STRING "Brotli static lib suffix used on Windows with MSVC (default _static)") - set(SNAPPY_MSVC_STATIC_LIB_SUFFIX "" CACHE STRING + set(SNAPPY_MSVC_STATIC_LIB_SUFFIX "_static" CACHE STRING "Snappy static lib suffix used on Windows with MSVC (default is empty string)") set(ZLIB_MSVC_STATIC_LIB_SUFFIX "libstatic" CACHE STRING "Zlib static lib suffix used on Windows with MSVC (default libstatic)") http://git-wip-us.apache.org/repos/asf/arrow/blob/dca5d96c/cpp/cmake_modules/SnappyCMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/cmake_modules/SnappyCMakeLists.txt b/cpp/cmake_modules/SnappyCMakeLists.txt index 9d0a166..50083ce 100644 --- a/cpp/cmake_modules/SnappyCMakeLists.txt +++ b/cpp/cmake_modules/SnappyCMakeLists.txt @@ -68,10 +68,10 @@ set(SNAPPY_SRCS snappy.cc snappy-stubs-public.h) add_library(snappy SHARED ${SNAPPY_SRCS}) -add_library(snappystatic STATIC ${SNAPPY_SRCS}) +add_library(snappy_static STATIC ${SNAPPY_SRCS}) TARGET_COMPILE_DEFINITIONS(snappy PRIVATE -DHAVE_CONFIG_H) -TARGET_COMPILE_DEFINITIONS(snappystatic PRIVATE -DHAVE_CONFIG_H) +TARGET_COMPILE_DEFINITIONS(snappy_static PRIVATE -DHAVE_CONFIG_H) install(FILES snappy.h snappy-c.h @@ -79,7 +79,7 @@ install(FILES snappy.h ${snappy_BINARY_DIR}/snappy-stubs-public.h DESTINATION include) -install(TARGETS snappy snappystatic +install(TARGETS snappy snappy_static RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) http://git-wip-us.apache.org/repos/asf/arrow/blob/dca5d96c/cpp/cmake_modules/ThirdpartyToolchain.cmake ---------------------------------------------------------------------- diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index b9d9823..721e866 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -501,7 +501,7 @@ if (ARROW_WITH_SNAPPY) set(SNAPPY_HOME "${SNAPPY_PREFIX}") set(SNAPPY_INCLUDE_DIR "${SNAPPY_PREFIX}/include") if (MSVC) - set(SNAPPY_STATIC_LIB_NAME snappystatic) + set(SNAPPY_STATIC_LIB_NAME snappy_static) else() set(SNAPPY_STATIC_LIB_NAME snappy) endif()