diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-01-11 20:15:34 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-01-11 11:15:34 -0800 |
| commit | 885ca2ce6cd1c9353f4a0f28f94547a1342a7ae2 (patch) | |
| tree | eec17b82cf5b643f87e97dc5c571bbc6ded48efb /ports/qt5-base | |
| parent | 1fe5a31cd771313e38c46cd63ad3a33aa0acad90 (diff) | |
| download | vcpkg-885ca2ce6cd1c9353f4a0f28f94547a1342a7ae2.tar.gz vcpkg-885ca2ce6cd1c9353f4a0f28f94547a1342a7ae2.zip | |
[libjpeg-turbo] use d suffix for debug libs (#4965)
* use d suffix for debug libs, improve compatibility with official FindJPEG.cmake (cmake 3.13)
* [libjpeg] fix also non-static case
* [libjpeg-turbo] bump version
* [libjpeg-turbo] fixes for regression on Linux/macOS
* [libjpeg-turbo] fix regression in qt5-base
* [linkjpeg-turbo] force CI test
Diffstat (limited to 'ports/qt5-base')
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index b6d140f88..696ae0cb6 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -79,13 +79,14 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore ${CORE_OPTIONS} -mp -opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" - LIBJPEG_LIBS="-ljpeg" OPTIONS_RELEASE + LIBJPEG_LIBS="-ljpeg" ZLIB_LIBS="-lzlib" LIBPNG_LIBS="-llibpng16" FREETYPE_LIBS="-lfreetype" PSQL_LIBS="-llibpq" OPTIONS_DEBUG + LIBJPEG_LIBS="-ljpegd" ZLIB_LIBS="-lzlibd" LIBPNG_LIBS="-llibpng16d" PSQL_LIBS="-llibpqd" @@ -100,8 +101,8 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") ${CORE_OPTIONS} -no-sqlite -no-opengl # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" - LIBJPEG_LIBS="-ljpeg" OPTIONS_RELEASE + "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a" "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a" @@ -109,6 +110,7 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a" "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a" OPTIONS_DEBUG + "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" |