aboutsummaryrefslogtreecommitdiff
path: root/ports/arrow
diff options
context:
space:
mode:
authoratkawa7 <atkawa7@yahoo.com>2017-06-13 17:12:54 -0700
committeratkawa7 <atkawa7@yahoo.com>2017-06-13 17:12:54 -0700
commitaa83671a723da212e640990ef9b9efafccba8af1 (patch)
treef50d482f3d2b4e3545a672eb58712ac553d272de /ports/arrow
parent9a409006cf7ec63bebe0d9341799b5cb529155ae (diff)
parent548ff8d3db47e83ebecc5b57dcbd63723cee7546 (diff)
downloadvcpkg-aa83671a723da212e640990ef9b9efafccba8af1.tar.gz
vcpkg-aa83671a723da212e640990ef9b9efafccba8af1.zip
Merge https://github.com/Microsoft/vcpkg into live555
Diffstat (limited to 'ports/arrow')
-rw-r--r--ports/arrow/CONTROL2
-rw-r--r--ports/arrow/portfile.cmake8
2 files changed, 8 insertions, 2 deletions
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL
index 2e0233bb6..717360d12 100644
--- a/ports/arrow/CONTROL
+++ b/ports/arrow/CONTROL
@@ -1,4 +1,4 @@
Source: arrow
-Version: apache-arrow-0.4.0
+Version: apache-arrow-0.4.0-1
Build-Depends: boost
Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
index 9bf6f999e..f5cdb1ae4 100644
--- a/ports/arrow/portfile.cmake
+++ b/ports/arrow/portfile.cmake
@@ -20,9 +20,15 @@ vcpkg_configure_cmake(
OPTIONS -DARROW_BUILD_TESTS=off
)
-
vcpkg_install_cmake()
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ file(RENAME ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/lib/arrow.lib)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow.lib)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
+else()
+ file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib)
+endif()
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/arrow RENAME copyright)