mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 08:09:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libjpeg-turbo] Consistency changes

Browse Source
This commit is contained in:
Alexander Karatarakis 2016-11-01 11:11:24 -07:00
parent c6a129319d
commit 37ab3c15cd
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libjpeg-turbo/CONTROL
View File

@ -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.

15
ports/libjpeg-turbo/portfile.cmake
View File

@ -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