diff options
| author | Sean Warren <s.warren@garvan.org.au> | 2019-03-14 09:33:48 -0400 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-14 06:33:47 -0700 |
| commit | f409536f5e8119376ee65d1f25d278b36b7f8136 (patch) | |
| tree | fd6a05b4f658bfd9a25576052f4ddbbcc42f4731 /scripts | |
| parent | e37a6c65d6b8c126ba50caad70cc2a7f839a2275 (diff) | |
| download | vcpkg-f409536f5e8119376ee65d1f25d278b36b7f8136.tar.gz vcpkg-f409536f5e8119376ee65d1f25d278b36b7f8136.zip | |
[qt5] Fix mac build (#5624)
* [qt5] Fix mac build
* [qt5] Disable parallel build on mac
* [qt5] Fix qmake find on mac
* [qt5] Update find jom for mac
* [qt5] Fix invocation of build command
* [qt5-base] Rebuild packages for #5624
* [harfbuzz] Remove disabled assert (failing due to -Werror)
* [qt5] Bump control version
* [qt5] Disable harfbuzz on mac
* [qt5-base] Disable harfbuzz on mac
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_build_qmake.cmake | 11 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_qmake.cmake | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index 947178686..5b686527d 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -9,7 +9,14 @@ function(vcpkg_build_qmake) cmake_parse_arguments(_csc "SKIP_MAKEFILES" "BUILD_LOGNAME" "TARGETS;RELEASE_TARGETS;DEBUG_TARGETS" ${ARGN}) - vcpkg_find_acquire_program(JOM) + + if(CMAKE_HOST_WIN32) + vcpkg_find_acquire_program(JOM) + set(INVOKE "${JOM}") + else() + find_program(MAKE make) + set(INVOKE "${MAKE}") + endif() # Make sure that the linker finds the libraries used set(ENV_PATH_BACKUP "$ENV{PATH}") @@ -29,7 +36,7 @@ function(vcpkg_build_qmake) function(run_jom TARGETS LOG_PREFIX LOG_SUFFIX) message(STATUS "Package ${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX}") vcpkg_execute_required_process( - COMMAND ${JOM} ${TARGETS} + COMMAND ${INVOKE} ${TARGETS} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${LOG_SUFFIX} LOGNAME package-${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX} ) diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index 3aa30e70d..11178174e 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -17,7 +17,7 @@ function(vcpkg_configure_qmake) cmake_parse_arguments(_csc "" "SOURCE_PATH" "OPTIONS" ${ARGN}) # Find qmake executable - find_program(QMAKE_COMMAND NAMES qmake.exe PATHS ${CURRENT_INSTALLED_DIR}/tools/qt5) + find_program(QMAKE_COMMAND NAMES qmake PATHS ${CURRENT_INSTALLED_DIR}/tools/qt5) if(NOT QMAKE_COMMAND) message(FATAL_ERROR "vcpkg_configure_qmake: unable to find qmake.") |