[arrow] branch master updated: ARROW-3467: [C++] Fix building against external double-conversion

[apitrou]

This is an automated email from the ASF dual-hosted git repository.

apitrou 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 2928468  ARROW-3467: [C++] Fix building against external 
double-conversion
2928468 is described below

commit 2928468ef665e106339fcc1161a9c1e1ebcfc2a3
Author: Dmitry Kalinkin <dmitry.kalin...@gmail.com>
AuthorDate: Tue Oct 9 13:57:30 2018 +0200

    ARROW-3467: [C++] Fix building against external double-conversion
    
    Author: Dmitry Kalinkin <dmitry.kalin...@gmail.com>
    
    Closes #2728 from veprbl/pr/ARROW-3467 and squashes the following commits:
    
    1ce23de8 <Dmitry Kalinkin> ARROW-3467: remove indirection by renaming 
external double-conversion target to double-conversion::double-conversion
    595c62c1 <Dmitry Kalinkin> ARROW-3467: double-conversion 3.1.1+ uses 
double-conversion:: prefix for CMake target name
---
 cpp/CMakeLists.txt                          | 4 ++--
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 4448b98..40575a7 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -615,7 +615,7 @@ endif(UNIX)
 set(ARROW_LINK_LIBS)
 
 # Libraries to link statically with libarrow.so
-set(ARROW_STATIC_LINK_LIBS double-conversion)
+set(ARROW_STATIC_LINK_LIBS double-conversion::double-conversion)
 
 if (ARROW_WITH_BROTLI)
   SET(ARROW_STATIC_LINK_LIBS
@@ -694,7 +694,7 @@ else ()
   set(ARROW_MIN_TEST_LIBS
     arrow_shared
     ${ARROW_LINK_LIBS}
-    double-conversion
+    double-conversion::double-conversion
     ${BOOST_SYSTEM_LIBRARY}
     ${BOOST_FILESYSTEM_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake 
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index e6c7f78..d814229 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -489,10 +489,10 @@ else()
 endif()
 
 include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR})
-ADD_THIRDPARTY_LIB(double-conversion
-  STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB})
 
 if (DOUBLE_CONVERSION_VENDORED)
+  ADD_THIRDPARTY_LIB(double-conversion::double-conversion
+    STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB})
   add_dependencies(arrow_dependencies double-conversion_ep)
 endif()