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 /ports/qt5-modularscripts | |
| 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 'ports/qt5-modularscripts')
| -rw-r--r-- | ports/qt5-modularscripts/qt_modular_library.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index a99d18478..fc3ebdef0 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -38,8 +38,13 @@ function(qt_modular_library NAME HASH) file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) - string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE) - string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE) + if(WIN32) + string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE) + string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE) + else() + set(INSTALLED_DIR_WITHOUT_DRIVE ${NATIVE_INSTALLED_DIR}) + set(PACKAGES_DIR_WITHOUT_DRIVE ${NATIVE_PACKAGES_DIR}) + endif() #Configure debug+release vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}) |