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-modularscripts | |
| 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-modularscripts')
| -rw-r--r-- | ports/qt5-modularscripts/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-modularscripts/qt_modular_library.cmake | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL index f8e6f4894..2b5a0a465 100644 --- a/ports/qt5-modularscripts/CONTROL +++ b/ports/qt5-modularscripts/CONTROL @@ -1,3 +1,3 @@ Source: qt5-modularscripts -Version: 2019-03-21 +Version: 2019-04-30 Description: Vcpkg helpers to package qt5 modules diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index 4136ffb8a..b3cf05b7b 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -31,12 +31,8 @@ function(qt_modular_build_library SOURCE_PATH) set(ENV{_CL_} "/utf-8") #Store build paths - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - endif() + set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") #Find Python and add it to the path vcpkg_find_acquire_program(PYTHON2) @@ -114,7 +110,9 @@ function(qt_modular_build_library SOURCE_PATH) #Move release and debug dlls to the correct directory if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/qt5 ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/qt5 ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + endif() + if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/tools/qt5) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/tools/qt5 ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}) endif() @@ -134,9 +132,13 @@ function(qt_modular_build_library SOURCE_PATH) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qt5/debug/include) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qt5/debug/include) + endif() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + endif() #Find the relevant license file and install it if(EXISTS "${SOURCE_PATH}/LICENSE.LGPLv3") |