aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchausner <15180557+chausner@users.noreply.github.com>2021-10-06 01:11:48 +0200
committerGitHub <noreply@github.com>2021-10-05 16:11:48 -0700
commite3a6b17c06514bd821dc8e3e0abadb9f2c6fab69 (patch)
tree268263e17ae052002cf978dfe23bc8fc934bf7a3
parent14644061a8076851c128fe41d7ade6fcbdeacba3 (diff)
downloadvcpkg-e3a6b17c06514bd821dc8e3e0abadb9f2c6fab69.tar.gz
vcpkg-e3a6b17c06514bd821dc8e3e0abadb9f2c6fab69.zip
[libmorton] Update to 0.2.8 (#20498)
* Update libmorton to 0.2.8 * Update CI baseline Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
-rw-r--r--ports/libmorton/portfile.cmake22
-rw-r--r--ports/libmorton/vcpkg.json15
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/l-/libmorton.json5
4 files changed, 34 insertions, 12 deletions
diff --git a/ports/libmorton/portfile.cmake b/ports/libmorton/portfile.cmake
index dee3b6e62..b86573121 100644
--- a/ports/libmorton/portfile.cmake
+++ b/ports/libmorton/portfile.cmake
@@ -1,14 +1,22 @@
-#header-only library
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Forceflow/libmorton
- REF v0.2
- SHA512 04cf8332a1cee52eebfb25a46ac64517900704f62fe53ccf1d6a74c535ccac5af4e3ce2e0a5ce94ee850fadb429fe0d88d5a66901f16e4308341a621e599d33d
+ REF v0.2.8
+ SHA512 7497203573965337F1216DB729D3F6806278B8DDFF539E8D01EF83FB3EAB50D5FF90C965CF5EA3A76464CF6F279C000434D2111B37D3D368834F7EF20959E790
HEAD_REF master
)
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmorton)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmorton/LICENSE ${CURRENT_PACKAGES_DIR}/share/libmorton/copyright)
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
+ OPTIONS
+ -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libmorton)
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-file(GLOB HEADER_FILES ${SOURCE_PATH}/libmorton/include/*.h)
-file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/libmorton)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file
diff --git a/ports/libmorton/vcpkg.json b/ports/libmorton/vcpkg.json
index c3df1681a..6ce97b430 100644
--- a/ports/libmorton/vcpkg.json
+++ b/ports/libmorton/vcpkg.json
@@ -1,6 +1,15 @@
{
"name": "libmorton",
- "version-string": "0.2",
- "port-version": 1,
- "description": "header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates"
+ "version": "0.2.8",
+ "description": "Header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
+ ]
}
diff --git a/versions/baseline.json b/versions/baseline.json
index 8efa2f8b0..f93c9c3e9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3569,8 +3569,8 @@
"port-version": 8
},
"libmorton": {
- "baseline": "0.2",
- "port-version": 1
+ "baseline": "0.2.8",
+ "port-version": 0
},
"libmpeg2": {
"baseline": "0.5.1",
diff --git a/versions/l-/libmorton.json b/versions/l-/libmorton.json
index 50136e69a..c97e9f12f 100644
--- a/versions/l-/libmorton.json
+++ b/versions/l-/libmorton.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "1b25f31e6c58dbf7106777360374ea7f84182ddc",
+ "version": "0.2.8",
+ "port-version": 0
+ },
+ {
"git-tree": "0c25c5cd76d1c395f24c0e22407673e2c88c6458",
"version-string": "0.2",
"port-version": 1