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-882: [C++] Rename statically build library on Windows to avoid …
Date Mon, 24 Apr 2017 01:56:37 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 26e5bb162 -> 33ac8a291


ARROW-882: [C++] Rename statically build library on Windows to avoid …

…conflict with shared version

Currently, statically built arrow.lib file overwrites previously built arrow.lib file of shared
build. To resolve this, statically built library renamed to arrow_static.lib

Author: Max Risuhin <risuhin.max@gmail.com>

Closes #590 from MaxRis/ARROW-882 and squashes the following commits:

4f2f3f0 [Max Risuhin] ARROW-882: [C++] Rename statically build library on Windows to avoid
conflict with shared version


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

Branch: refs/heads/master
Commit: 33ac8a29176df340faa204b6c2e61b2973db028e
Parents: 26e5bb1
Author: Max Risuhin <risuhin.max@gmail.com>
Authored: Sun Apr 23 21:56:19 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Sun Apr 23 21:56:19 2017 -0400

----------------------------------------------------------------------
 cpp/cmake_modules/BuildUtils.cmake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/33ac8a29/cpp/cmake_modules/BuildUtils.cmake
----------------------------------------------------------------------
diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
index 4e6532b..db83efe 100644
--- a/cpp/cmake_modules/BuildUtils.cmake
+++ b/cpp/cmake_modules/BuildUtils.cmake
@@ -147,11 +147,16 @@ function(ADD_ARROW_LIB LIB_NAME)
   endif()
 
   if (ARROW_BUILD_STATIC)
+      if (MSVC)
+        set(LIB_NAME_STATIC ${LIB_NAME}_static)
+      else()
+        set(LIB_NAME_STATIC ${LIB_NAME})
+      endif()
       add_library(${LIB_NAME}_static STATIC $<TARGET_OBJECTS:${LIB_NAME}_objlib>)
     set_target_properties(${LIB_NAME}_static
       PROPERTIES
       LIBRARY_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}"
-      OUTPUT_NAME ${LIB_NAME})
+      OUTPUT_NAME ${LIB_NAME_STATIC})
 
   target_link_libraries(${LIB_NAME}_static
       LINK_PUBLIC ${ARG_STATIC_LINK_LIBS}


Mime
View raw message