diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-01 11:11:24 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-01 11:11:24 -0700 |
| commit | 37ab3c15cd787bf7325f62e4fd9e9ae40d6b8516 (patch) | |
| tree | b5fb8642e44a089d959e20291c331e74a4f5448c | |
| parent | c6a129319d7a74d6af6cef428d56bef24c1f85d6 (diff) | |
| download | vcpkg-37ab3c15cd787bf7325f62e4fd9e9ae40d6b8516.tar.gz vcpkg-37ab3c15cd787bf7325f62e4fd9e9ae40d6b8516.zip | |
[libjpeg-turbo] Consistency changes
| -rw-r--r-- | ports/libjpeg-turbo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libjpeg-turbo/portfile.cmake | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 1c1cd5d16..9c5ee1d07 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,3 +1,3 @@ Source: libjpeg-turbo -Version: 1.4.90-2 +Version: 1.4.90-1 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 c688f74a7..0ec4a0c9c 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -1,11 +1,4 @@ include(${CMAKE_TRIPLET_FILE}) -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILD_STATIC ON) - set(NOT_BUILD_STATIC OFF) -else() - set(BUILD_STATIC OFF) - set(NOT_BUILD_STATIC ON) -endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libjpeg-turbo-1.4.90) @@ -24,6 +17,14 @@ vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH}") +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_STATIC OFF) + set(NOT_BUILD_STATIC ON) +else() + set(BUILD_STATIC ON) + set(NOT_BUILD_STATIC OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS |