Merge branch 'dev/LilyWang/CI_1215_marisa' of https://github.com/Lily…

…WangLL/vcpkg into dev/LilyWang/CI_1215_marisa
microsoft · Dec 19, 2022 · 8d309c2 · 8d309c2
2 parents c139413 + 7bb8106
commit 8d309c2
Show file tree

Hide file tree

Showing 46 changed files with 265 additions and 58 deletions.
diff --git a/ports/amd-amf/portfile.cmake b/ports/amd-amf/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO GPUOpen-LibrariesAndSDKs/AMF
+        REF v1.4.26
+        SHA512 2c931ef7d38ade88a96041e0012605a5d25ec484bb2134f58310cf1a2c7212a869797cef99e2e751c8a6b3c473ba1f8762d4a5d41466d38cb5e31bf664a25f55
+        HEAD_REF master
+)
+
+# Install the AMF headers to the default vcpkg location
+file(INSTALL "${SOURCE_PATH}/amf/public/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/AMF")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/ports/amd-amf/vcpkg.json b/ports/amd-amf/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "amd-amf",
+  "version": "1.4.26",
+  "description": "AMD Advanced Media Framework headers",
+  "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/AMF",
+  "license": "MIT",
+  "supports": "!osx"
+}
diff --git a/ports/asio/asio-config.cmake b/ports/asio/asio-config.cmake
@@ -1,6 +1,9 @@
 include ("${CMAKE_CURRENT_LIST_DIR}/asio-targets.cmake")
-add_library(asio::asio INTERFACE IMPORTED)
-target_link_libraries(asio::asio INTERFACE asio)
+
+if(NOT TARGET asio::asio)
+    add_library(asio::asio INTERFACE IMPORTED)
+    target_link_libraries(asio::asio INTERFACE asio)
+endif()
 
 get_target_property(_ASIO_INCLUDE_DIR asio INTERFACE_INCLUDE_DIRECTORIES)
 set(ASIO_INCLUDE_DIR "${_ASIO_INCLUDE_DIR}")
diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "asio",
   "version": "1.24.0",
+  "port-version": 1,
   "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
   "homepage": "https://github.com/chriskohlhoff/asio",
   "documentation": "https://think-async.com/Asio/asio-1.24.0/doc/",

diff --git a/ports/bgfx/fix-dependencies.patch b/ports/bgfx/fix-dependencies.patch
@@ -0,0 +1,49 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14eb13d..dad3b53 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -149,7 +149,7 @@ if( BGFX_INSTALL )
+ 			 INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ 	)
+ 	if( NOT BGFX_LIBRARY_TYPE MATCHES "SHARED" )
+-		install( TARGETS bimg bx astc-encoder edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr
++		install( TARGETS bimg bx astc-encoder edtaa3 etc1 etc2 iqa pvrtc
+ 				 EXPORT "${TARGETS_EXPORT_NAME}"
+ 				 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ 				 ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake
+index 9519b3a..e4b6341 100644
+--- a/cmake/bimg.cmake
++++ b/cmake/bimg.cmake
+@@ -14,10 +14,11 @@ include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/edtaa3.cmake )
+ include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc1.cmake )
+ include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc2.cmake )
+ include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/iqa.cmake )
+-include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/libsquish.cmake )
+-include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/nvtt.cmake )
+ include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/pvrtc.cmake )
+-include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/tinyexr.cmake )
++find_package(tinyexr CONFIG REQUIRED)
++find_package(unofficial-libsquish CONFIG REQUIRED)
++find_library(NVTT_LIBRARIES NAMES nvtt libnvtt PATH_SUFFIXES static)
++find_path(NVTT_INCLUDE_DIRS NAMES nvtt.h PATH_SUFFIXES nvtt)
+
+ # Ensure the directory exists
+ if( NOT IS_DIRECTORY ${BIMG_DIR} )
+@@ -33,12 +34,13 @@ add_library( bimg STATIC ${BIMG_SOURCES} )
+
+ # Add include directory of bimg
+ target_include_directories( bimg
+-	PUBLIC
++    PUBLIC
+ 		$<BUILD_INTERFACE:${BIMG_DIR}/include>
+ 		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
++target_include_directories( bimg PRIVATE ${NVTT_INCLUDE_DIRS})
+ # bimg dependencies
+-target_link_libraries( bimg PUBLIC bx PRIVATE astc-encoder edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr )
++target_link_libraries( bimg PUBLIC bx PRIVATE astc-encoder edtaa3 etc1 etc2 iqa unofficial::libsquish::squish ${NVTT_LIBRARIES} pvrtc unofficial::tinyexr::tinyexr )
+
+ # Put in a "bgfx" folder in Visual Studio
+ set_target_properties( bimg PROPERTIES FOLDER "bgfx" )
+\ No newline at end of file
diff --git a/ports/bgfx/fix-headerfile.patch b/ports/bgfx/fix-headerfile.patch
@@ -0,0 +1,13 @@
+diff --git a/src/image_decode.cpp b/src/image_decode.cpp
+index dd391e5..8218ac9 100644
+--- a/src/image_decode.cpp
++++ b/src/image_decode.cpp
+@@ -19,7 +19,7 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4505) // warning C4505: 'tinyexr::miniz::def_r
+ #define MINIZ_NO_ARCHIVE_APIS
+ #define MINIZ_NO_STDIO
+ #define TINYEXR_IMPLEMENTATION
+-#include <tinyexr/tinyexr.h>
++#include <tinyexr.h>
+ BX_PRAGMA_DIAGNOSTIC_POP()
+
+ BX_PRAGMA_DIAGNOSTIC_PUSH();
diff --git a/ports/bgfx/portfile.cmake b/ports/bgfx/portfile.cmake
@@ -18,6 +18,7 @@ vcpkg_from_github(
   HEAD_REF master
   REF 85109d7cdbe775a0ab72cf38510df525d5e8d3da
   SHA512 b3e082cd249e802e6d209ed45a552843604713a06597277b2855d1fa1c39b3d5136d5589599a85126eda218ccfee0ce6177f004cb5dccb912fe64ea7e07af2a8
+  PATCHES fix-headerfile.patch
 )
 
 vcpkg_from_github(
@@ -44,6 +45,7 @@ endif ()
 
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
+    PATCHES fix-dependencies.patch
 )
 
 vcpkg_cmake_configure(

diff --git a/ports/bgfx/vcpkg.json b/ports/bgfx/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "bgfx",
   "version": "1.118.8384-362",
+  "port-version": 1,
   "maintainers": "Sandy Carter <[email protected]>",
   "description": "Cross-platform, graphics API agnostic, Bring Your Own Engine/Framework style rendering library.",
   "homepage": "https://bkaradzic.github.io/bgfx/overview.html",
   "documentation": "https://bkaradzic.github.io/bgfx",
   "license": "BSD-2-Clause",
   "dependencies": [
+    "libsquish",
+    "nvtt",
+    "tinyexr",
     {
       "name": "vcpkg-cmake",
       "host": true

diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
     REF v${VERSION}
-    SHA512 983d37824a8d9e24ff107d27f11cb4f8ea53516dc2c5c9b32d4758c718f29041eecdb023d81a2776c87d283e3671722352c9f0eea02393b5bb191fa26bb12c82
+    SHA512 f9be225ca042f03ea750e77e8a0118f631100d607181ffe505e74063f3a0eda95de6ff0b7db39b7a31e8ea3ce72da5a95b408a1d34c89f57c3b9ec8a97c4fe5b
     HEAD_REF devel
     PATCHES
         fix-install-path.patch

diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "catch2",
-  "version-semver": "3.2.0",
+  "version-semver": "3.2.1",
   "description": "A modern, header-only test framework for unit testing.",
   "homepage": "https://github.com/catchorg/Catch2",
   "license": "BSL-1.0",

diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake
@@ -71,11 +71,11 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/cryptopp)
 
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
-file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/cryptopp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cryptopp.pc")
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/cryptopp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cryptopp.pc")
+if(NOT VCPKG_BUILD_TYPE)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+endif()
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
 vcpkg_fixup_pkgconfig()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig")
 
 # There is no way to suppress installation of the headers and resource files in debug build.
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

diff --git a/ports/cryptopp/vcpkg.json b/ports/cryptopp/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "cryptopp",
   "version": "8.7.0",
+  "port-version": 1,
   "description": "Crypto++ is a free C++ class library of cryptographic schemes.",
   "homepage": "https://github.com/weidai11/cryptopp",
+  "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO KhronosGroup/glslang
-  REF 11.12.0
-  SHA512 fd955f9912551668056dfe52835eef11e5dc0bf0d25b2d961a31f684adbd63bc6380759944c1921cfd63d359a58c7cc3a4a4d5eea69fa1b050f58960e5101271
+  REF 11.13.0
+  SHA512 20c2a6543b002648f459f26bd36b5c445afd6d8eae175e400dbe45632f11ca8de1f9e6f6e98fd6f910aa75d90063e174c095e7df26d9d4982192b84d08b0dc8b
   HEAD_REF master
   PATCHES
     ignore-crt.patch

diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "glslang",
-  "version": "11.12.0",
-  "port-version": 1,
+  "version": "11.13.0",
   "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator",
   "homepage": "https://github.com/KhronosGroup/glslang",
   "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",

diff --git a/ports/ideviceinstaller/Add-missing-lib.patch b/ports/ideviceinstaller/Add-missing-lib.patch
@@ -0,0 +1,40 @@
+diff --git a/ideviceinstaller.vcxproj b/ideviceinstaller.vcxproj
+index dd8d483..4b15d7e 100644
+--- a/ideviceinstaller.vcxproj
++++ b/ideviceinstaller.vcxproj
+@@ -112,7 +112,7 @@
+     <Link>
+       <SubSystem>Console</SubSystem>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+@@ -126,7 +126,7 @@
+     <Link>
+       <SubSystem>Console</SubSystem>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+@@ -144,7 +144,7 @@
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+@@ -162,7 +162,7 @@
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup>
diff --git a/ports/ideviceinstaller/portfile.cmake b/ports/ideviceinstaller/portfile.cmake
@@ -1,13 +1,16 @@
+vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libimobiledevice-win32/ideviceinstaller
-    REF 1.1.2.23
+    REF ${VERSION}
     SHA512 d0801b3a38eb02206a6f06e05cc19b794c69a87c06895165f64522c61e07030046499c5f0e436981682f9e17f91eae87913cca091e2e039a74ee35a5136100d4
     HEAD_REF msvc-master
+    PATCHES Add-missing-lib.patch
 )
 
 vcpkg_install_msbuild(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     PROJECT_SUBPATH ideviceinstaller.vcxproj
     LICENSE_SUBPATH COPYING
     USE_VCPKG_INTEGRATION

diff --git a/ports/ideviceinstaller/vcpkg.json b/ports/ideviceinstaller/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "ideviceinstaller",
   "version": "1.1.2.23",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Manage apps of iOS devices",
+  "homepage": "https://libimobiledevice.org/",
   "license": "LGPL-2.1-only",
   "supports": "windows & !arm64",
   "dependencies": [

diff --git a/ports/libirecovery/vcpkg.json b/ports/libirecovery/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "libirecovery",
   "version": "1.0.25",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux",
   "license": "LGPL-2.1-only",
-  "supports": "windows & !arm64",
+  "supports": "windows & !arm64 & !static & !staticcrt",
   "dependencies": [
     "getopt",
     "libusbmuxd",

diff --git a/ports/libphonenumber/vcpkg.json b/ports/libphonenumber/vcpkg.json
@@ -3,7 +3,7 @@
   "version": "8.13.1",
   "description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.",
   "license": "Apache-2.0",
-  "supports": "!static & !linux & !osx",
+  "supports": "!linux & !osx",
   "dependencies": [
     "abseil",
     "boost-date-time",

diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake
@@ -30,12 +30,14 @@ vcpkg_cmake_configure(
         -DWITH_WEBKIT3=OFF
         -DWITH_KDE=${VCPKG_TARGET_IS_LINUX}
         -DMSVC_STATIC=${STATICCRT}
+        -DWITH_GNOME3=OFF
     MAYBE_UNUSED_VARIABLES
         WITH_DOTNET
         WITH_PERL
         WITH_PYTHON2
         WITH_PYTHON3
         WITH_VALA
+        MSVC_STATIC
 )
 
 vcpkg_cmake_install()

diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libproxy",
   "version": "0.4.18",
+  "port-version": 1,
   "description": "libproxy is a library that provides automatic proxy configuration management.",
   "homepage": "https://github.com/libproxy/libproxy",
   "license": "LGPL-2.1-only",

diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Neargye/magic_enum
-    REF v0.8.1
-    SHA512 97b14ddfa2fec4b582f4658cea96f61510b3eb1f367d770a642136ffbaf7e5d87e6a8c950f7ac6af47cc605899d0ff8e2b9c71a19a28ad1dfaa724f003339edc
+    REF v0.8.2
+    SHA512 849c426484156faf91dde3f32f6c755c7698879b16dd83e13fb86b299b53ec9bbe4d55267581386302c8acb93d80ec044cc248371fdc8608cdd8f4ab12099f0a
     HEAD_REF master
 )
 

diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "magic-enum",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.",
   "homepage": "https://github.com/Neargye/magic_enum",
   "license": "MIT",

diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
@@ -224,12 +224,18 @@ else()
         "--without-readline"
         "--disable-test-modules"
     )
+    if (VCPKG_CROSSCOMPILING)
+        list(APPEND OPTIONS "ac_cv_file__dev_ptmx=no")
+        list(APPEND OPTIONS "ac_cv_file__dev_ptc=no")
+    endif()
+
     if(VCPKG_TARGET_IS_OSX)
         list(APPEND OPTIONS "LIBS=-liconv -lintl")
     endif()
 
     vcpkg_configure_make(
         SOURCE_PATH "${SOURCE_PATH}"
+        DETERMINE_BUILD_TRIPLET
         OPTIONS ${OPTIONS}
         OPTIONS_DEBUG "--with-pydebug"
     )

diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "python3",
   "version": "3.10.7",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The Python programming language",
   "homepage": "https://github.com/python/cpython",
   "license": "Python-2.0",

diff --git a/ports/qt5-base/cmake/install_qt.cmake b/ports/qt5-base/cmake/install_qt.cmake
@@ -78,16 +78,6 @@ function(install_qt)
             endif()
         endif()
 
-        if(VCPKG_TARGET_IS_OSX)
-           # For some reason there will be an error on MacOSX without this clean!
-            message(STATUS "Cleaning before build ${_build_triplet}")
-            vcpkg_execute_required_process(
-                COMMAND ${INVOKE_SINGLE} clean
-                WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet}
-                LOGNAME cleaning-1-${_build_triplet}
-            )
-        endif()
-
         message(STATUS "Building ${_build_triplet}")
         vcpkg_execute_build_process(
             COMMAND ${INVOKE}
@@ -101,8 +91,8 @@ function(install_qt)
             message(STATUS "Cleaning after build before install ${_build_triplet}")
             vcpkg_execute_required_process(
                 COMMAND ${INVOKE_SINGLE} clean
-                WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet}
-                LOGNAME cleaning-2-${_build_triplet}
+                WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet}/qmake
+                LOGNAME cleaning-after-build-${_build_triplet}
             )
         endif()