aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Karney <charles@karney.com>2021-07-01 10:35:58 -0400
committerGitHub <noreply@github.com>2021-07-01 07:35:58 -0700
commit71ffad876db5d23f238bd3a84518bd8ad5eaab76 (patch)
tree2e64f31a250aff75d4b5b79958d735682c45b864
parentb5488330e97e440e21343e89aa3d7cbbf9932019 (diff)
downloadvcpkg-71ffad876db5d23f238bd3a84518bd8ad5eaab76.tar.gz
vcpkg-71ffad876db5d23f238bd3a84518bd8ad5eaab76.zip
[geographiclib] Update to version 1.52 (#18694)
* [geographiclib] Update to version 1.52 * run ./vcpkg x-add-version geographiclib * ports/geographiclib/vcpkg.json: version-string -> version * Another iteration with x-add-version
-rw-r--r--ports/geographiclib/cxx-library-only.patch19
-rw-r--r--ports/geographiclib/portfile.cmake4
-rw-r--r--ports/geographiclib/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/g-/geographiclib.json5
5 files changed, 12 insertions, 20 deletions
diff --git a/ports/geographiclib/cxx-library-only.patch b/ports/geographiclib/cxx-library-only.patch
index 2e3893a97..d1201794b 100644
--- a/ports/geographiclib/cxx-library-only.patch
+++ b/ports/geographiclib/cxx-library-only.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 345df69b..cb891034 100644
+index eb08bd48..88552153 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,6 +196,11 @@ else ()
@@ -74,23 +74,10 @@ index 345df69b..cb891034 100644
if (GEOGRAPHICLIB_PRECISION EQUAL 2)
set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index cbc21961..69c923bc 100644
+index fd0669f2..4744e08d 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
-@@ -33,10 +33,10 @@ configure_file (project-config.cmake.in
- configure_file (project-config-version.cmake.in
- "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" @ONLY)
- export (TARGETS
-- ${PROJECT_ALL_LIBRARIES} ${TOOLS}
-+ ${PROJECT_ALL_LIBRARIES}
- FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-targets.cmake")
- export (TARGETS
-- ${PROJECT_ALL_LIBRARIES} ${TOOLS}
-+ ${PROJECT_ALL_LIBRARIES}
- NAMESPACE ${PROJECT_NAME}::
- FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake")
-
-@@ -44,13 +44,7 @@ export (TARGETS
+@@ -56,13 +56,7 @@ export (TARGETS
# ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
# path to the root from there. (Note that the whole install tree can
# be relocated.)
diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake
index e948114cd..3b7bd3f51 100644
--- a/ports/geographiclib/portfile.cmake
+++ b/ports/geographiclib/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_from_sourceforge (
OUT_SOURCE_PATH SOURCE_PATH
REPO geographiclib
REF distrib
- FILENAME "GeographicLib-1.51.tar.gz"
- SHA512 34487a09fa94a34d24179cfe9fd2e5fdda28675966703ca137cbfe6cc88760c2fbde55f76c464de060b58bfe0a516e22c0f59318cf85ae7cc01c5c6a73dd6ead
+ FILENAME "GeographicLib-1.52.tar.gz"
+ SHA512 98a4d33764db4a4755851a7db639fd9e055dcf4f1f949258e112fce2e198076b5896fcae2c1ea36b37fe1000d28eec326636a730e70f25bc19a1610423ba6859
PATCHES cxx-library-only.patch
)
diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json
index 18deaa771..df18eaf32 100644
--- a/ports/geographiclib/vcpkg.json
+++ b/ports/geographiclib/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "geographiclib",
- "version-string": "1.51",
+ "version": "1.52",
"description": "GeographicLib, a C++ library for performing geographic conversions",
"homepage": "https://geographiclib.sourceforge.io",
"features": {
diff --git a/versions/baseline.json b/versions/baseline.json
index 41f5d7308..3185bad2e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2221,7 +2221,7 @@
"port-version": 3
},
"geographiclib": {
- "baseline": "1.51",
+ "baseline": "1.52",
"port-version": 0
},
"geos": {
diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json
index dd034bcd5..8fd320c34 100644
--- a/versions/g-/geographiclib.json
+++ b/versions/g-/geographiclib.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b80d69df97ec60b98b202270c5357b72729fbc90",
+ "version": "1.52",
+ "port-version": 0
+ },
+ {
"git-tree": "eafff91d7abd708bd49584dc4070e091d427e333",
"version-string": "1.51",
"port-version": 0