aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralexsmn <alexsmn@gmail.com>2019-03-06 14:58:41 -0700
committerPhil Christensen <philc@microsoft.com>2019-03-06 13:58:41 -0800
commit7e97b94e67525d152bcc153ca0f52fc8c87c9f9b (patch)
treef97f4eec2771fbce5fd89c663f85bb45a9a575d7
parent40c1a2305cd94c4b00e8104586ac52b49ba17956 (diff)
downloadvcpkg-7e97b94e67525d152bcc153ca0f52fc8c87c9f9b.tar.gz
vcpkg-7e97b94e67525d152bcc153ca0f52fc8c87c9f9b.zip
[Qt5] remove empty dirs (#5025)
* Add qt5-activeqt library. * qt5: Fix build failure due to empty output directories. * [qt5-base] whitespace change to force clean test build in CI system
-rw-r--r--ports/qt5-activeqt/portfile.cmake2
-rw-r--r--ports/qt5-base/portfile.cmake1
-rw-r--r--ports/qt5-declarative/portfile.cmake2
-rw-r--r--ports/qt5-tools/portfile.cmake2
4 files changed, 4 insertions, 3 deletions
diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake
index 6040fc1aa..9914ef6fd 100644
--- a/ports/qt5-activeqt/portfile.cmake
+++ b/ports/qt5-activeqt/portfile.cmake
@@ -4,4 +4,4 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmak
qt_modular_library(qtactiveqt ff2871a7c0fa2674354f8bbd32196d8b2af34212e09e0f8c1df23182353959464dfb8c96800e45dae380f239082f62ed6f1904e72dc93e43141edb4f2606edd9)
-#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/plugins/platforminputcontexts)
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index e5b59aeb9..2d069c6f3 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -188,3 +188,4 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_
file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/plugins)
file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+# \ No newline at end of file
diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake
index afa19aa53..adda51330 100644
--- a/ports/qt5-declarative/portfile.cmake
+++ b/ports/qt5-declarative/portfile.cmake
@@ -4,4 +4,4 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmak
qt_modular_library(qtdeclarative e06032da5c1c151200215f55728b9ce0fac299076f0ca3150143525a56bcce15eb72f6aa982b439e3920d1cd7a30468b3f0913f135d644ecda277d763fb5e1b5)
-#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/plugins/platforminputcontexts) \ No newline at end of file
diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake
index 1cc0a7f9b..e430e4e95 100644
--- a/ports/qt5-tools/portfile.cmake
+++ b/ports/qt5-tools/portfile.cmake
@@ -4,4 +4,4 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmak
qt_modular_library(qttools e3ae1974f0b20bad1b86d038c3585753183b8c24c133393e3ecf65a0487402ad8dcf8147bf263e9a4c2d3abef1b706981943fcf5268726e424f1b61f69ce4f2e)
-#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/plugins/platforminputcontexts) \ No newline at end of file