Skip to content

Add option VCPKG_QMAKE_USE_NMAKE in vcpkg_build_qmake and install_qt #8524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicole mazzuca (strega-nil) merged 13 commits into from
Nov 23, 2020
Merged

Add option VCPKG_QMAKE_USE_NMAKE in vcpkg_build_qmake and install_qt #8524

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
51ab670
add option PREFER_NMAKE to vcpkg_build_qmake and install_qt.
Oct 9, 2019
faf1e26
Add /MP to qt5-base/vcpkg_build_qmake.
Oct 11, 2019
53d4245
use VCPKG_QMAKE_USE_NMAKE instead of as function parameter.
Nov 20, 2019
8f563c3
Merge branch 'master' into dev/jack/add_prefer_nmake
JackBoosY Nov 25, 2019
72a19ed
Merge branch 'master' into dev/jack/add_prefer_nmake
JackBoosY Jan 3, 2020
67facd3
Merge branch 'master' into dev/jack/add_prefer_nmake
JackBoosY Jan 7, 2020
ed2a9d7
Merge branch 'master' into dev/jack/add_prefer_nmake
JackBoosY Feb 24, 2020
612263a
Merge branch 'master' into dev/jack/add_prefer_nmake
JackBoosY Jun 10, 2020
9b4e727
Merge remote-tracking branch 'origin/master' into dev/jack/add_prefer…
BillyONeal Jun 11, 2020
9b27fa2
Update ports/qt5-base/cmake/install_qt.cmake
JackBoosY Jun 12, 2020
049edac
Update scripts/cmake/vcpkg_build_qmake.cmake
JackBoosY Jun 12, 2020
22ad738
Merge branch 'master' into dev/jack/add_prefer_nmake
JackBoosY Sep 10, 2020
fb55726
Merge branch 'master' into dev/jack/add_prefer_nmake
JackBoosY Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ports/qt5-base/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Source: qt5-base
Version: 5.12.8-4
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, 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.14.2) instead of LTS
Source: qt5-base
Version: 5.12.8-5
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, 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.14.2) instead of LTS
13 changes: 11 additions & 2 deletions ports/qt5-base/cmake/install_qt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@ include(qt_fix_makefile_install)

function(install_qt)
if(CMAKE_HOST_WIN32)
vcpkg_find_acquire_program(JOM)
set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY})
if (VCPKG_QMAKE_USE_NMAKE)
find_program(NMAKE nmake REQUIRED)
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")
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
else()
vcpkg_find_acquire_program(JOM)
set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY})
endif()
else()
find_program(MAKE make)
set(INVOKE "${MAKE}" -j${VCPKG_CONCURRENCY})
Expand Down
13 changes: 11 additions & 2 deletions scripts/cmake/vcpkg_build_qmake.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,17 @@ function(vcpkg_build_qmake)
cmake_parse_arguments(_csc "SKIP_MAKEFILES" "BUILD_LOGNAME" "TARGETS;RELEASE_TARGETS;DEBUG_TARGETS" ${ARGN})

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")
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
else()
vcpkg_find_acquire_program(JOM)
set(INVOKE "${JOM}")
endif()
else()
find_program(MAKE make)
set(INVOKE "${MAKE}")
Expand Down