aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-01-18 02:13:50 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-01-18 07:36:38 -0800
commit7b0cfc6f6c5464e4f008b5ccbd99c9ac01e95bee (patch)
tree9dec93a18ffa1c576cd858a79e1a74de565252cc
parentca9ff199d6024fa0ef26abcba920928215d77f38 (diff)
downloadvcpkg-7b0cfc6f6c5464e4f008b5ccbd99c9ac01e95bee.tar.gz
vcpkg-7b0cfc6f6c5464e4f008b5ccbd99c9ac01e95bee.zip
[qt5-base] Remove debug qmake.exe
-rw-r--r--ports/qt5-base/CONTROL2
-rw-r--r--ports/qt5-base/portfile.cmake2
-rw-r--r--ports/qt5-base/qt_debug.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index f2a507e19..039a0b873 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-base
-Version: 5.9.2-0
+Version: 5.9.2-1
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index bde933392..0badd0477 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -77,8 +77,8 @@ file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*.exe")
file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
file(REMOVE ${BINARY_TOOLS})
file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
-file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/qt5)
file(REMOVE ${BINARY_TOOLS})
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
diff --git a/ports/qt5-base/qt_debug.conf b/ports/qt5-base/qt_debug.conf
index 1314d00b9..45cac7a4b 100644
--- a/ports/qt5-base/qt_debug.conf
+++ b/ports/qt5-base/qt_debug.conf
@@ -10,4 +10,4 @@ Qml2Imports = qml
Data = share/qt5/debug
ArchData = share/qt5/debug
HostData = share/qt5/debug
-HostBinaries = debug/tools/qt5 \ No newline at end of file
+HostBinaries = tools/qt5 \ No newline at end of file