diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-08-01 22:48:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-01 13:48:24 -0700 |
| commit | f7fe9e374fa85103e144972d0d9a2dc368d8f66f (patch) | |
| tree | ac414a9b220636e5d8fb779b63697141f1951070 /ports/qt5-base | |
| parent | f7dcd675d08f7a6974893e592e2aee0b7c318bb0 (diff) | |
| download | vcpkg-f7fe9e374fa85103e144972d0d9a2dc368d8f66f.tar.gz vcpkg-f7fe9e374fa85103e144972d0d9a2dc368d8f66f.zip | |
[qt5-base] Add zstd as a dependency (#12342)
* [qt5-base] add hidden optional not switchable zstd dependency.
* [netcdf/paraview] correct embree3 dependency
[paraview] make tools default feature for CI testing.
* [paraview] fix typo and remove unnecessary flags
* [paraview] add flags back into portfile
* [vtk] add hdf5 api patch
[paraview] remove hdf5 use flags from portfile
[field3d] use flags instead of patching to fix hdf5.
* [paraview] remove message on osx since it now works with qt 5.15
* [paraview] remove default feature and force CI features by a CI test port
* [paraview|CI] back out python from CI testing for now
* [qt5-base] add in the macos deployment target fix
Diffstat (limited to 'ports/qt5-base')
| -rw-r--r-- | ports/qt5-base/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 2763b32aa..e79f75e49 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -3,7 +3,7 @@ Version: 5.15.0 Port-Version: 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, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
+Build-Depends: zlib, zstd, 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.15.0) instead of LTS (latest and LTS are currently the same)
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index f98992673..9d0f0bad4 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -186,7 +186,7 @@ set(RELEASE_OPTIONS "FREETYPE_LIBS=${FREETYPE_RELEASE_ALL}" "ICU_LIBS=${ICU_RELEASE}" "QMAKE_LIBS_PRIVATE+=${BZ2_RELEASE}" - "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE}" + "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE}" ) set(DEBUG_OPTIONS "LIBJPEG_LIBS=${JPEG_DEBUG}" @@ -261,7 +261,7 @@ elseif(VCPKG_TARGET_IS_OSX) set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) message(STATUS "Enviromnent OSX SDK Version: $ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET}") FILE(READ "${SOURCE_PATH}/mkspecs/common/macx.conf" _tmp_contents) - string(REPLACE "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12" "QMAKE_MACOSX_DEPLOYMENT_TARGET = ${VCPKG_OSX_DEPLOYMENT_TARGET}" _tmp_contents ${_tmp_contents}) + string(REPLACE "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13" "QMAKE_MACOSX_DEPLOYMENT_TARGET = ${VCPKG_OSX_DEPLOYMENT_TARGET}" _tmp_contents ${_tmp_contents}) FILE(WRITE "${SOURCE_PATH}/mkspecs/common/macx.conf" ${_tmp_contents}) endif() #list(APPEND QT_PLATFORM_CONFIGURE_OPTIONS HOST_PLATFORM ${TARGET_MKSPEC}) |