diff options
| author | Robert Colton <robertbcolton@gmail.com> | 2018-10-22 13:49:16 -0400 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-22 10:49:16 -0700 |
| commit | 473d63c4edf1ab704b597abc4987372712b005f6 (patch) | |
| tree | c71b88e9675841a92559e53fabb02e2ea3b55e36 /ports/qt5-modularscripts | |
| parent | cba23fe693f0d6b5e1ef50a197b74fdd8804c60a (diff) | |
| download | vcpkg-473d63c4edf1ab704b597abc4987372712b005f6.tar.gz vcpkg-473d63c4edf1ab704b597abc4987372712b005f6.zip | |
Qt 5.11 and static build fixes (#4164)
* fix da qt5
* fix qt config duplication
* [qt5-base] Use vcpkg_extract_source_archive_ex
[sqlite3] Enable SQLITE_ENABLE_COLUMN_METADATA
* [qt5-*] Update sub-portfiles
* qt5-base WIP
* [qt5] Fix Could not find qmlcachegen.exe
* [qt5-activeqt] Fix SHA512
* [qt5-base] Fix static builds
* [qt5-base] Bump control version
* [qt5-base] Restore removal of qmake dependencies
* [qt5-base] Partially revert #3280
* [qt5-base][vcpkg_build_qmake] Fix Qt5Bootstrap.lib issues
Diffstat (limited to 'ports/qt5-modularscripts')
| -rw-r--r-- | ports/qt5-modularscripts/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-modularscripts/qt_modular_library.cmake | 30 |
2 files changed, 15 insertions, 17 deletions
diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL index 73460375c..2186d94e0 100644 --- a/ports/qt5-modularscripts/CONTROL +++ b/ports/qt5-modularscripts/CONTROL @@ -1,3 +1,3 @@ Source: qt5-modularscripts -Version: 4 +Version: 2018-09-10-2 Description: Vcpkg helpers to package qt5 modules diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index cd269bb4d..22859c8e1 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -8,24 +8,20 @@ function(qt_modular_library NAME HASH) ) endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Qt5 doesn't currently support static builds. Please use a dynamic triplet instead.") - endif() - - set(SRCDIR_NAME "${NAME}-5.9.2") - set(ARCHIVE_NAME "${NAME}-opensource-src-5.9.2") - set(ARCHIVE_EXTENSION ".tar.xz") + set(MAJOR_MINOR 5.11) + set(FULL_VERSION ${MAJOR_MINOR}.1) + set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") - set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${SRCDIR_NAME}) vcpkg_download_distfile(ARCHIVE_FILE - URLS "http://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/${ARCHIVE_NAME}${ARCHIVE_EXTENSION}" - FILENAME ${SRCDIR_NAME}${ARCHIVE_EXTENSION} + URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" + FILENAME ${ARCHIVE_NAME} SHA512 ${HASH} ) - vcpkg_extract_source_archive(${ARCHIVE_FILE}) - if (EXISTS ${CURRENT_BUILDTREES_DIR}/src/${ARCHIVE_NAME}) - file(RENAME ${CURRENT_BUILDTREES_DIR}/src/${ARCHIVE_NAME} ${CURRENT_BUILDTREES_DIR}/src/${SRCDIR_NAME}) - endif() + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE_FILE}" + REF ${FULL_VERSION} + ) # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings set(ENV{_CL_} "/utf-8") @@ -61,9 +57,11 @@ function(qt_modular_library NAME HASH) file(GLOB_RECURSE MAKEFILES ${DEBUG_DIR}/*Makefile* ${RELEASE_DIR}/*Makefile*) - #Set the correct install directory to packages foreach(MAKEFILE ${MAKEFILES}) - vcpkg_replace_string(${MAKEFILE} "(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}") + file(READ "${MAKEFILE}" _contents) + #Set the correct install directory to packages + string(REPLACE "(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}" _contents "${_contents}") + file(WRITE "${MAKEFILE}" "${_contents}") endforeach() #Install the module files |