diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-12-23 06:10:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-23 06:10:12 -0800 |
| commit | c0d22c88ea7638d1b74339f9e9adfd37b0f525ed (patch) | |
| tree | 2475474c4825663531b1e60490d350a85c68a1a5 /scripts/cmake/vcpkg_configure_qmake.cmake | |
| parent | 5e88eec627c2e007624f69f34acdaabafa239a0f (diff) | |
| download | vcpkg-c0d22c88ea7638d1b74339f9e9adfd37b0f525ed.tar.gz vcpkg-c0d22c88ea7638d1b74339f9e9adfd37b0f525ed.zip | |
[vcpkg_install_qmake] Add vcpkg_install_qmake (#9412)
* [vcpkg_install_qmake] Add vcpkg_install_qmake and convert existing ports to use it.
[vcpkg_configure_qmake] Add 'staticlib' to CONFIG in static builds
* [vcpkg_configure_qmake] Don't specify DESTDIR
* [libqglviewer][vcpkg_configure_qmake] Add staticlib CONFIG only for libqglviewer
* [qt5-base] Increment version to track changes in vcpkg_configure_qmake()
Diffstat (limited to 'scripts/cmake/vcpkg_configure_qmake.cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_qmake.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index a04a4c8f6..ad5682a3d 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -26,7 +26,7 @@ function(vcpkg_configure_qmake) message(FATAL_ERROR "vcpkg_configure_qmake: unable to find qmake.") endif() - if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "static") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND _csc_OPTIONS "CONFIG-=shared") list(APPEND _csc_OPTIONS "CONFIG*=static") else() @@ -35,10 +35,10 @@ function(vcpkg_configure_qmake) list(APPEND _csc_OPTIONS_DEBUG "CONFIG*=separate_debug_info") endif() - if(VCPKG_TARGET_IS_WINDOWS AND ${VCPKG_CRT_LINKAGE} STREQUAL "static") + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static") list(APPEND _csc_OPTIONS "CONFIG*=static-runtime") endif() - + # Cleanup build directories file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) @@ -55,9 +55,9 @@ function(vcpkg_configure_qmake) set(BUILD_OPT -- ${_csc_BUILD_OPTIONS} ${_csc_BUILD_OPTIONS_RELEASE}) endif() vcpkg_execute_required_process( - COMMAND ${QMAKE_COMMAND} CONFIG-=debug CONFIG+=release - ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE} ${_csc_SOURCE_PATH} - -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf" + COMMAND ${QMAKE_COMMAND} CONFIG-=debug CONFIG+=release + ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE} ${_csc_SOURCE_PATH} + -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf" ${BUILD_OPT} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel LOGNAME config-${TARGET_TRIPLET}-rel @@ -74,8 +74,8 @@ function(vcpkg_configure_qmake) set(BUILD_OPT -- ${_csc_BUILD_OPTIONS} ${_csc_BUILD_OPTIONS_DEBUG}) endif() vcpkg_execute_required_process( - COMMAND ${QMAKE_COMMAND} CONFIG-=release CONFIG+=debug - ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG} ${_csc_SOURCE_PATH} + COMMAND ${QMAKE_COMMAND} CONFIG-=release CONFIG+=debug + ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG} ${_csc_SOURCE_PATH} -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf" ${BUILD_OPT} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg |