diff options
| author | João Maia <jpmmaia@gmail.com> | 2019-04-30 19:29:41 +0300 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-04-30 09:29:41 -0700 |
| commit | 5314524f445222209aff9f372933fef0702e1913 (patch) | |
| tree | 60606cb556647c43c16f52743dc719537403ec3e /ports/qt5-base | |
| parent | 516d10bb68dc5da7a58c992373b9e971d74a49fe (diff) | |
| download | vcpkg-5314524f445222209aff9f372933fef0702e1913.tar.gz vcpkg-5314524f445222209aff9f372933fef0702e1913.zip | |
[qt5] Fix scripts on debug/release-only builds (#6259)
* Fix qt5-base portfile
qt5-release.conf was not copied in release mode
* Fix vcpkg_configure_qmake.cmake in debug-only builds
* Add VCPKG_BUILD_TYPE support to qt_modular_library.cmake and vcpkg_build_qmake.cmake
Diffstat (limited to 'ports/qt5-base')
| -rw-r--r-- | ports/qt5-base/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 8bdf69050..a58004756 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base -Version: 5.12.1-5 +Version: 5.12.1-6 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, openssl diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 7b21258e9..3e6c5ae46 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -157,6 +157,8 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$") file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5) file(REMOVE ${BINARY_TOOLS}) + + file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*") @@ -166,7 +168,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5) endif() vcpkg_execute_required_process( |