aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Tassoux <rt2@rt2.fr>2017-12-23 18:07:20 +0100
committerRémy Tassoux <rt2@rt2.fr>2017-12-23 18:07:20 +0100
commit538e61ab91af2fb1072ab9c7164e91cb592713ab (patch)
treee01e81e8334a70e51387904b10a424ea9ff0ecbb
parent6699ddabb1b3cf753401a79d6da544437e3b2994 (diff)
downloadvcpkg-538e61ab91af2fb1072ab9c7164e91cb592713ab.tar.gz
vcpkg-538e61ab91af2fb1072ab9c7164e91cb592713ab.zip
[bullet3] Update from 2.86.1 to 2.87
-rw-r--r--ports/bullet3/CONTROL2
-rw-r--r--ports/bullet3/portfile.cmake32
2 files changed, 23 insertions, 11 deletions
diff --git a/ports/bullet3/CONTROL b/ports/bullet3/CONTROL
index 92b55db2e..36f8b1838 100644
--- a/ports/bullet3/CONTROL
+++ b/ports/bullet3/CONTROL
@@ -1,3 +1,3 @@
Source: bullet3
-Version: 2.86.1-1
+Version: 2.87
Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake
index 17d6f8ea7..f86f323f3 100644
--- a/ports/bullet3/portfile.cmake
+++ b/ports/bullet3/portfile.cmake
@@ -1,11 +1,23 @@
+# Common Ambient Variables:
+# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
+# PORT = current port name (zlib, etc)
+# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
+# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
+# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
+# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
+# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bullet3-2.86.1)
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/bulletphysics/bullet3/archive/2.86.1.zip"
- FILENAME "bullet3-2.86.1.zip"
- SHA512 96c67bed63db4b7d46196cebda57b80543ea37bd19f013adcfe19ee6c2c3319ed007bcd1ebbe345d8c75b7e80588f4a7d85cb6a07e1a5eea759d97ce4d94f972
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO bulletphysics/bullet3
+ REF 2.87
+ SHA512 649e470223295666eda6f7ff59d03097637c2645b5cd951977060ae14b89f56948ce03e437e83c986d26876f187d7ee34e790bc3882d5d66da9af89a4ab81c21
+ HEAD_REF master
)
-vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
@@ -22,14 +34,14 @@ vcpkg_configure_cmake(
-DINSTALL_LIBS=ON
)
-vcpkg_build_cmake()
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/bullet3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/bullet3/copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics/details)
vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3 RENAME copyright) \ No newline at end of file