diff options
Diffstat (limited to 'Tools/qmake/projects/run_cmake.pro')
| -rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index 4b47f54f4..5603ed72e 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -6,14 +6,6 @@ TEMPLATE = aux qtConfig(debug_and_release): CONFIG += debug_and_release build_all -msvc:!contains(QMAKE_HOST.arch, x86_64) { - debug_and_release { - warning("Skipping debug build of QtWebKit because it requires a 64-bit toolchain") - CONFIG -= debug_and_release debug - CONFIG += release - } -} - CONFIG(debug, debug|release) { configuration = Debug } else { @@ -28,9 +20,15 @@ build_pass|!debug_and_release { PORT=Qt \ CMAKE_BUILD_TYPE=$$configuration \ CMAKE_TOOLCHAIN_FILE=$$toolchain_file \ - CMAKE_PREFIX_PATH=\"$$[QT_INSTALL_PREFIX];$$ROOT_QT_BUILD_DIR/qtbase;$$ROOT_QT_BUILD_DIR/qtlocation;$$ROOT_QT_BUILD_DIR/qtsensors\" \ USE_LIBHYPHEN=OFF + !isEmpty(_QMAKE_SUPER_CACHE_) { + CMAKE_PREFIX_PATH=\"$$ROOT_QT_BUILD_DIR/qtbase;$$ROOT_QT_BUILD_DIR/qtlocation;$$ROOT_QT_BUILD_DIR/qtsensors;$$ROOT_QT_BUILD_DIR/qtdeclarative;$$ROOT_QT_BUILD_DIR/qtwebchannel\" + } else { + CMAKE_PREFIX_PATH=\"$$[QT_INSTALL_PREFIX]\" + } + CMAKE_CONFIG += CMAKE_PREFIX_PATH=$$CMAKE_PREFIX_PATH + static: CMAKE_CONFIG += USE_THIN_ARCHIVES=OFF static_runtime: CMAKE_CONFIG += USE_STATIC_RUNTIME=ON @@ -64,6 +62,10 @@ build_pass|!debug_and_release { CMAKE_CONFIG += QT_CONAN_DIR=$$ROOT_BUILD_DIR } + msvc:!contains(QMAKE_HOST.arch, x86_64) { + CMAKE_CONFIG += USE_MINIMAL_DEBUG_INFO_MSVC=ON + } + macos { # Reuse the cached sdk version value from mac/sdk.prf if available # otherwise query for it. |