arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-1308: [C++] Link utility executables to Arrow shared library if ARROW_BUILD_STATIC=off
Date Wed, 02 Aug 2017 03:00:42 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 7e7861c55 -> e50b6ae5c


ARROW-1308: [C++] Link utility executables to Arrow shared library if ARROW_BUILD_STATIC=off

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #931 from wesm/ARROW-1308 and squashes the following commits:

88391fe0 [Wes McKinney] Link utility executables to Arrow shared library if ARROW_BUILD_STATIC=off


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/e50b6ae5
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/e50b6ae5
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/e50b6ae5

Branch: refs/heads/master
Commit: e50b6ae5c8044ac425db8609fb837fe7c95bd393
Parents: 7e7861c
Author: Wes McKinney <wes.mckinney@twosigma.com>
Authored: Tue Aug 1 23:00:37 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Tue Aug 1 23:00:37 2017 -0400

----------------------------------------------------------------------
 cpp/src/arrow/ipc/CMakeLists.txt | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/e50b6ae5/cpp/src/arrow/ipc/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/CMakeLists.txt b/cpp/src/arrow/ipc/CMakeLists.txt
index 9cc61bc..76e52a0 100644
--- a/cpp/src/arrow/ipc/CMakeLists.txt
+++ b/cpp/src/arrow/ipc/CMakeLists.txt
@@ -90,18 +90,22 @@ install(FILES
   writer.h
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/ipc")
 
-if(MSVC)
-  set(UTIL_LINK_LIBS
-    arrow_static
-    ${BOOST_FILESYSTEM_LIBRARY}
-    ${BOOST_SYSTEM_LIBRARY})
+if (ARROW_BUILD_STATIC)
+  set(ARROW_UTIL_LIB arrow_static)
 else()
+  set(ARROW_UTIL_LIB arrow_shared)
+endif()
+
+set(UTIL_LINK_LIBS
+  ${ARROW_UTIL_LIB}
+  ${BOOST_FILESYSTEM_LIBRARY}
+  ${BOOST_SYSTEM_LIBRARY})
+
+if(NOT MSVC)
   set(UTIL_LINK_LIBS
-    arrow_static
+    ${UTIL_LINK_LIBS}
     pthread
-    ${BOOST_FILESYSTEM_LIBRARY}
-    ${BOOST_SYSTEM_LIBRARY}
-    dl)
+    ${CMAKE_DL_LIBS})
 endif()
 
 if (ARROW_BUILD_UTILITIES)


Mime
View raw message