diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-11-23 15:26:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 15:26:01 -0800 |
| commit | 5cd25eee5ddc70668f43e944d586e62be49ccc75 (patch) | |
| tree | 289ebaac1fdcacdd858e764347a0245eb2c1e3d0 | |
| parent | 820ad09d6d3e37d555faaff50d15dd1143cd5631 (diff) | |
| download | vcpkg-5cd25eee5ddc70668f43e944d586e62be49ccc75.tar.gz vcpkg-5cd25eee5ddc70668f43e944d586e62be49ccc75.zip | |
Add option VCPKG_QMAKE_USE_NMAKE in vcpkg_build_qmake and install_qt (#8524)
* add option PREFER_NMAKE to vcpkg_build_qmake and install_qt.
* Add /MP to qt5-base/vcpkg_build_qmake.
* use VCPKG_QMAKE_USE_NMAKE instead of as function parameter.
* Update ports/qt5-base/cmake/install_qt.cmake
* Update scripts/cmake/vcpkg_build_qmake.cmake
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/qt5-base/CONTROL | 18 | ||||
| -rw-r--r-- | ports/qt5-base/cmake/install_qt.cmake | 16 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_build_qmake.cmake | 13 |
3 files changed, 33 insertions, 14 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 10a7d5429..34209500b 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,9 +1,9 @@ -Source: qt5-base
-Version: 5.15.1
-Port-Version: 1
-Homepage: https://www.qt.io/
-Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
-Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
-
-Feature: latest
-Description: Build latest qt version (5.15.1) instead of LTS (latest and LTS are currently the same)
+Source: qt5-base +Version: 5.15.1 +Port-Version: 2 +Homepage: https://www.qt.io/ +Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. +Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) + +Feature: latest +Description: Build latest qt version (5.15.1) instead of LTS (latest and LTS are currently the same) diff --git a/ports/qt5-base/cmake/install_qt.cmake b/ports/qt5-base/cmake/install_qt.cmake index 97f2e71a2..640a308de 100644 --- a/ports/qt5-base/cmake/install_qt.cmake +++ b/ports/qt5-base/cmake/install_qt.cmake @@ -2,9 +2,19 @@ include(qt_fix_makefile_install) function(install_qt) if(CMAKE_HOST_WIN32) - vcpkg_find_acquire_program(JOM) - set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY}) - set(INVOKE_SINGLE "${JOM}" /J 1) + if (VCPKG_QMAKE_USE_NMAKE) + find_program(NMAKE nmake REQUIRED) + set(INVOKE "${NMAKE}") + set(INVOKE_SINGLE "${NMAKE}") + get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) + set(PATH_GLOBAL "$ENV{PATH}") + set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") + set(ENV{CL} "$ENV{CL} /MP${VCPKG_CONCURRENCY}") + else() + vcpkg_find_acquire_program(JOM) + set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY}) + set(INVOKE_SINGLE "${JOM}" /J 1) + endif() else() find_program(MAKE make) set(INVOKE "${MAKE}" -j${VCPKG_CONCURRENCY}) diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index d4c435a0d..5568c080c 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -11,8 +11,17 @@ function(vcpkg_build_qmake) cmake_parse_arguments(PARSE_ARGV 0 _csc "SKIP_MAKEFILES" "BUILD_LOGNAME" "TARGETS;RELEASE_TARGETS;DEBUG_TARGETS") if(CMAKE_HOST_WIN32) - vcpkg_find_acquire_program(JOM) - set(INVOKE "${JOM}") + if (VCPKG_QMAKE_USE_NMAKE) + find_program(NMAKE nmake) + set(INVOKE "${NMAKE}") + get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) + set(PATH_GLOBAL "$ENV{PATH}") + set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") + set(ENV{CL} "$ENV{CL} /MP${VCPKG_CONCURRENCY}") + else() + vcpkg_find_acquire_program(JOM) + set(INVOKE "${JOM}") + endif() else() find_program(MAKE make) set(INVOKE "${MAKE}") |