From 5cd25eee5ddc70668f43e944d586e62be49ccc75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 23 Nov 2020 15:26:01 -0800 Subject: 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 --- scripts/cmake/vcpkg_build_qmake.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'scripts') 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}") -- cgit v1.2.3