aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2018-12-20 22:58:43 -0800
committerGitHub <noreply@github.com>2018-12-20 22:58:43 -0800
commit6ec8eebaeb865c06be12ef5f039860d441163251 (patch)
tree8e8d1261c2bbb907102f6a4a52e87280ef786517
parent99b06bba5d86a6982f2491d9f4ea7ef637ff3747 (diff)
parentea831f43024a06700a9d8e901c1cb87844a63d81 (diff)
downloadvcpkg-6ec8eebaeb865c06be12ef5f039860d441163251.tar.gz
vcpkg-6ec8eebaeb865c06be12ef5f039860d441163251.zip
Merge pull request #4966 from studiofuga/dev/studiofuga/geos
[Geos] Remove empty */bin directories when statically linking
-rw-r--r--ports/geos/CONTROL2
-rw-r--r--ports/geos/portfile.cmake4
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/geos/CONTROL b/ports/geos/CONTROL
index 0a4421eea..cb19bebd9 100644
--- a/ports/geos/CONTROL
+++ b/ports/geos/CONTROL
@@ -1,3 +1,3 @@
Source: geos
-Version: 3.6.3-2
+Version: 3.6.3-3
Description: Geometry Engine Open Source
diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake
index 2f374e79d..673b159f8 100644
--- a/ports/geos/portfile.cmake
+++ b/ports/geos/portfile.cmake
@@ -26,6 +26,10 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/geos-config)