aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorangelmixu <salemixu@gmail.com>2020-02-04 23:49:41 +0100
committerGitHub <noreply@github.com>2020-02-04 14:49:41 -0800
commitd808514c9df44bb97d6eccff952bfe8ec4e156f7 (patch)
tree25a8f5bcd96c1392e235d6fa9ca308a25f45f94b /ports
parente9b976af70cb51e6510d76994e548de6c83c9de0 (diff)
downloadvcpkg-d808514c9df44bb97d6eccff952bfe8ec4e156f7.tar.gz
vcpkg-d808514c9df44bb97d6eccff952bfe8ec4e156f7.zip
[poco] bin and debug/bin directories should also be removed on macOS (#9798)
* [poco] bin and debug/bin directories should also be removed on macOS * white space for rebuild * updated platform comparison
Diffstat (limited to 'ports')
-rw-r--r--ports/poco/CONTROL2
-rw-r--r--ports/poco/portfile.cmake2
-rw-r--r--ports/qt5-winextras/portfile.cmake2
3 files changed, 3 insertions, 3 deletions
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL
index 9ea94f496..be032c6de 100644
--- a/ports/poco/CONTROL
+++ b/ports/poco/CONTROL
@@ -1,5 +1,5 @@
Source: poco
-Version: 1.9.2-1
+Version: 1.9.2-2
Build-Depends: expat, libpq, pcre, sqlite3, zlib, libpng
Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.
Homepage: https://github.com/pocoproject/poco
diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake
index 4e7995a49..27eddc982 100644
--- a/ports/poco/portfile.cmake
+++ b/ports/poco/portfile.cmake
@@ -121,7 +121,7 @@ endif()
#
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if (VCPKG_LIBRARY_LINKAGE STREQUAL static OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/bin
${CURRENT_PACKAGES_DIR}/debug/bin)
diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake
index 54153bed7..69c3adbb2 100644
--- a/ports/qt5-winextras/portfile.cmake
+++ b/ports/qt5-winextras/portfile.cmake
@@ -2,4 +2,4 @@ if (NOT VCPKG_TARGET_IS_WINDOWS)
message(FATAL_ERROR "qt5-winextras only support Windows.")
endif()
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation() \ No newline at end of file
+qt_submodule_installation()