From d808514c9df44bb97d6eccff952bfe8ec4e156f7 Mon Sep 17 00:00:00 2001 From: angelmixu Date: Tue, 4 Feb 2020 23:49:41 +0100 Subject: [PATCH] [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 --- ports/poco/CONTROL | 2 +- ports/poco/portfile.cmake | 2 +- ports/qt5-winextras/portfile.cmake | 2 +- 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()