diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-09-20 23:06:43 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-09-20 14:06:43 -0700 |
| commit | 86a5b6fd7b58be61ebc375c5f61b3e99fd47b2ae (patch) | |
| tree | 29914d1ca396a7e136bc2e381bff46a459ff163e /ports/qt5-base | |
| parent | d060ff5b8bcc3c42cafec2dbf51d6be2e1cd4cac (diff) | |
| download | vcpkg-86a5b6fd7b58be61ebc375c5f61b3e99fd47b2ae.tar.gz vcpkg-86a5b6fd7b58be61ebc375c5f61b3e99fd47b2ae.zip | |
[Qt] Fix static builds of qt5-imageformats (#8222)
* forward extra arguments to vcpkg_configure_qmake from submodules
* make image format dependent on tiff and libwebp
* make tools dependent on imageformat
* build options must be passed a bit different then normal qmake options
* add the required dependencies
* a new dependency discovered in qt5-declarative
* need webpdemux also
* qt5-declarative is dependent on imageformats so we can drop it here
* remove empty qt.conf if it exists. closes #8180
* add all recommended dependencies as dependencies in control.
Diffstat (limited to 'ports/qt5-base')
| -rw-r--r-- | ports/qt5-base/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-base/cmake/qt_build_submodule.cmake | 2 | ||||
| -rw-r--r-- | ports/qt5-base/cmake/qt_submodule_installation.cmake | 2 | ||||
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index b9357f9d5..bf29bfe5f 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,5 @@ Source: qt5-base
-Version: 5.12.5
+Version: 5.12.5-1
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
diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index f850ad551..78249f58a 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -7,7 +7,7 @@ function(qt_build_submodule SOURCE_PATH) get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
vcpkg_add_to_path("${PYTHON2_EXE_PATH}")
- vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH})
+ vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH} ${ARGV})
vcpkg_build_qmake(SKIP_MAKEFILES)
diff --git a/ports/qt5-base/cmake/qt_submodule_installation.cmake b/ports/qt5-base/cmake/qt_submodule_installation.cmake index a76e1bcbd..197c0ace4 100644 --- a/ports/qt5-base/cmake/qt_submodule_installation.cmake +++ b/ports/qt5-base/cmake/qt_submodule_installation.cmake @@ -5,7 +5,7 @@ function(qt_submodule_installation) if(QT_UPDATE_VERSION)
SET(VCPKG_POLICY_EMPTY_PACKAGE enabled PARENT_SCOPE)
else()
- qt_build_submodule(${TARGET_SOURCE_PATH})
+ qt_build_submodule(${TARGET_SOURCE_PATH} ${ARGV})
qt_install_copyright(${TARGET_SOURCE_PATH})
endif()
endfunction()
\ No newline at end of file diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index b734f3e12..9aa937ae4 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -251,6 +251,10 @@ else() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5/bin) endif() + + if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) + file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf") + endif() qt_install_copyright(${SOURCE_PATH}) endif() |