diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-10-25 11:28:27 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-10-25 11:28:27 -0700 |
| commit | d1627a0a8056453a7b777e5108756c935b0eeec0 (patch) | |
| tree | 07603e4962f8095cdb689914286545b762f1938a | |
| parent | b71d992d953e446d47d94b7555383412740d1226 (diff) | |
| download | vcpkg-d1627a0a8056453a7b777e5108756c935b0eeec0.tar.gz vcpkg-d1627a0a8056453a7b777e5108756c935b0eeec0.zip | |
[libjpeg-turbo] Fix CRT linkage
| -rw-r--r-- | ports/libjpeg-turbo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libjpeg-turbo/portfile.cmake | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index bf642bd1b..d63d15db9 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,3 +1,3 @@ Source: libjpeg-turbo -Version: 1.5.2-1 +Version: 1.5.2-2 Description: libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems. diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index a5d09fda2..225b23353 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -16,13 +16,9 @@ vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(ENABLE_STATIC OFF) - set(ENABLE_SHARED ON) -else() - set(ENABLE_STATIC ON) - set(ENABLE_SHARED OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") set(LIBJPEGTURBO_SIMD -DWITH_SIMD=OFF) @@ -36,6 +32,7 @@ vcpkg_configure_cmake( -DENABLE_SHARED=${ENABLE_SHARED} -DENABLE_EXECUTABLES=OFF -DINSTALL_DOCS=OFF + -DWITH_CRT_DLL=${WITH_CRT_DLL} ${LIBJPEGTURBO_SIMD} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) |