diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2016-11-01 11:07:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 11:07:40 -0700 |
| commit | c6a129319d7a74d6af6cef428d56bef24c1f85d6 (patch) | |
| tree | 911a3575f7afa98ada154f84890204204ebc61cf | |
| parent | 8fe4c3ba287f8328d8d3b6e9d114507afcdfdefe (diff) | |
| parent | bbfe03fc2bbbcd7afa5d6a52234c45450968c27c (diff) | |
| download | vcpkg-c6a129319d7a74d6af6cef428d56bef24c1f85d6.tar.gz vcpkg-c6a129319d7a74d6af6cef428d56bef24c1f85d6.zip | |
Merge pull request #236 from Morten242/libjpeg-turbo-static
[libjpeg-turbo] Enable static build
| -rw-r--r-- | ports/libjpeg-turbo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libjpeg-turbo/portfile.cmake | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 9c5ee1d07..1c1cd5d16 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,3 +1,3 @@ Source: libjpeg-turbo -Version: 1.4.90-1 +Version: 1.4.90-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 44958628c..c688f74a7 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -1,6 +1,10 @@ include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + 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) @@ -23,7 +27,8 @@ set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DENABLE_STATIC=OFF + -DENABLE_STATIC=${BUILD_STATIC} + -DENABLE_SHARED=${NOT_BUILD_STATIC} -DWITH_CRT_DLL=ON -DENABLE_EXECUTABLES=OFF -DINSTALL_DOCS=OFF |