aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Kuhn <matthias@opengis.ch>2021-06-21 22:45:05 +0200
committerGitHub <noreply@github.com>2021-06-21 13:45:05 -0700
commitec5178efe5c743413f0a07137fbdff47be970e0f (patch)
tree97c31154a4555c705ce60e3a7b78447651520e8e
parenta07171a4cfe5a570f63014c696002cb8c9d9daab (diff)
downloadvcpkg-ec5178efe5c743413f0a07137fbdff47be970e0f.tar.gz
vcpkg-ec5178efe5c743413f0a07137fbdff47be970e0f.zip
[librttopo] Allow building for Android (#18451)
* [librttopo] Allow building for android * x-add-version * Update versions/l-/librttopo.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
-rw-r--r--ports/librttopo/CONTROL2
-rw-r--r--ports/librttopo/portfile.cmake2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/librttopo.json5
4 files changed, 8 insertions, 3 deletions
diff --git a/ports/librttopo/CONTROL b/ports/librttopo/CONTROL
index fd8e85fbb..c54f902b1 100644
--- a/ports/librttopo/CONTROL
+++ b/ports/librttopo/CONTROL
@@ -1,5 +1,5 @@
Source: librttopo
-Version: 1.1.0-2
+Version: 1.1.0-3
Homepage: https://git.osgeo.org/gitea/rttopo/librttopo
Description: The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided [data stores] (doc/DATASTORES.md) and released under the GNU GPL license (version 2 or later).
Build-Depends: geos
diff --git a/ports/librttopo/portfile.cmake b/ports/librttopo/portfile.cmake
index 77d7b5932..a689b0043 100644
--- a/ports/librttopo/portfile.cmake
+++ b/ports/librttopo/portfile.cmake
@@ -34,7 +34,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/librttopo.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/librttopo.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
+else () # Build in UNIX
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
AUTOCONFIG
diff --git a/versions/baseline.json b/versions/baseline.json
index b8b44c1ad..5e924fc50 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3513,7 +3513,7 @@
"port-version": 2
},
"librttopo": {
- "baseline": "1.1.0-2",
+ "baseline": "1.1.0-3",
"port-version": 0
},
"libsamplerate": {
diff --git a/versions/l-/librttopo.json b/versions/l-/librttopo.json
index 3c7a93329..48dc1400e 100644
--- a/versions/l-/librttopo.json
+++ b/versions/l-/librttopo.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b248b7c998e21a3feaf8581d8418306d54d5edc9",
+ "version-string": "1.1.0-3",
+ "port-version": 0
+ },
+ {
"git-tree": "dfaa13a1e256dae5bf673ee6c803b30d73ce25d8",
"version-string": "1.1.0-2",
"port-version": 0