diff options
| author | João Maia <jpmmaia@gmail.com> | 2019-04-26 00:30:39 +0300 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-04-25 14:30:39 -0700 |
| commit | d299ad61079bc77c331751623308c7739ff977e3 (patch) | |
| tree | 7a28c08cfd4d0082ffe1f255ef63f3a1dd2e9f1b /ports/qt5-modularscripts | |
| parent | 7ec28764b6f3fb8ab5e182bc348d42ae159b90da (diff) | |
| download | vcpkg-d299ad61079bc77c331751623308c7739ff977e3.tar.gz vcpkg-d299ad61079bc77c331751623308c7739ff977e3.zip | |
[qt5] Build qt5 release/debug targets according to VCPKG_BUILD_TYPE (#6215)
Diffstat (limited to 'ports/qt5-modularscripts')
| -rw-r--r-- | ports/qt5-modularscripts/qt_modular_library.cmake | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index 9f6d23fa1..4136ffb8a 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -31,8 +31,12 @@ function(qt_modular_build_library SOURCE_PATH) set(ENV{_CL_} "/utf-8") #Store build paths - set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + 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() #Find Python and add it to the path vcpkg_find_acquire_program(PYTHON2) @@ -86,8 +90,12 @@ function(qt_modular_build_library SOURCE_PATH) endif() file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl") - file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH) - file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH) + endif() foreach(PRL_FILE IN LISTS PRL_FILES) file(READ "${PRL_FILE}" _contents) string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}") |