mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-13 07:38:11 +08:00
5f3249e50e
* Fix for openjpeg issue 16645 compile with VS2019 16.9.1
- Modified portfile.cmake to apply patch
fix-lrintf-to-opj_lrintf.patch
- Added patch to change /src/lib/openmj2/opj_includes.h
From: static INLINE long lrintf(float f)
To: static INLINE long opj_lrintf(float f)
- Converted CONTROL file to vcpkg.json file
- Fix was tested locally on triplet x64-windows with
Microsoft Windows x64 Professional 20H2 [Version 10.0.19042.867]
Windows Feature Experience Pack 120.2212.551.0
Windows SDK [Version 10.0.19041.0]
VS 2017:
Visual Studio 2017 Community Edition [Version 15.9.34]
Visual Studio Toolset [Version 14.16.27023]
Microsoft (R) C/C++ Optimizing Compiler [Version 19.16.27045 for x64]
VS 2019:
Visual Studio 2019 Community Edition [Version 16.9.1]
Visual Studio Toolset [Version 14.28.29910]
Microsoft (R) C/C++ Optimizing Compiler [Version 19.28.29912 for x64]
* Update json file
* Reformat vcpkg.json file
* Update port version
* Update json file
* Update ports/openjpeg/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update ports/openjpeg/vcpkg.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update versions/baseline.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update versions/o-/openjpeg.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update json file
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
78 lines
2.5 KiB
CMake
78 lines
2.5 KiB
CMake
vcpkg_from_github(
|
|
OUT_SOURCE_PATH SOURCE_PATH
|
|
REPO uclouvain/openjpeg
|
|
REF v2.3.1
|
|
SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
|
|
HEAD_REF master
|
|
PATCHES
|
|
dll.location.patch
|
|
fix-lrintf-to-opj_lrintf.patch
|
|
)
|
|
|
|
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
|
list(APPEND OPTIONS "-DBUILD_SHARED_LIBS=OFF"
|
|
"-DBUILD_STATIC_LIBS=ON")
|
|
else()
|
|
list(APPEND OPTIONS "-DBUILD_SHARED_LIBS=ON"
|
|
"-DBUILD_STATIC_LIBS=OFF")
|
|
endif()
|
|
|
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|
"jpwl" BUILD_JPWL
|
|
"mj2" BUILD_MJ2
|
|
"jpip" BUILD_JPIP
|
|
"jp3d" BUILD_JP3D
|
|
)
|
|
|
|
vcpkg_configure_cmake(
|
|
SOURCE_PATH ${SOURCE_PATH}
|
|
PREFER_NINJA
|
|
OPTIONS -DBUILD_CODEC:BOOL=OFF
|
|
-DBUILD_DOC:BOOL=OFF
|
|
-DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg
|
|
-DOPENJPEG_INSTALL_INCLUDE_DIR=include
|
|
-DEXECUTABLE_OUTPUT_PATH=tools/${PORT}
|
|
-DBUILD_PKGCONFIG_FILES=ON
|
|
${FEATURE_OPTIONS}
|
|
${OPTIONS}
|
|
)
|
|
|
|
vcpkg_install_cmake()
|
|
vcpkg_fixup_cmake_targets()
|
|
if(VCPKG_TARGET_IS_WINDOWS)
|
|
# TODO: remove -lm from *.pc files
|
|
endif()
|
|
vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m)
|
|
|
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
|
|
|
set(TOOL_NAMES)
|
|
if("jpwl" IN_LIST FEATURES)
|
|
list(APPEND TOOL_NAMES opj_dec_server opj_jpwl_compress opj_jpwl_decompress)
|
|
endif()
|
|
if("mj2" IN_LIST FEATURES)
|
|
list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_mj2_compress opj_mj2_decompress opj_mj2_extract opj_mj2_wrap)
|
|
endif()
|
|
if("jpip" IN_LIST FEATURES)
|
|
list(APPEND TOOL_NAMES opj_jpip_addxml opj_jpip_test opj_jpip_transcode)
|
|
endif()
|
|
if("jp3d" IN_LIST FEATURES)
|
|
list(APPEND TOOL_NAMES opj_jp3d_compress opj_jp3d_decompress)
|
|
endif()
|
|
if(TOOL_NAMES)
|
|
vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN)
|
|
endif()
|
|
file(READ ${CURRENT_PACKAGES_DIR}/include/openjpeg.h OPENJPEG_H)
|
|
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
|
string(REPLACE "defined(OPJ_STATIC)" "1" OPENJPEG_H "${OPENJPEG_H}")
|
|
else()
|
|
string(REPLACE "defined(OPJ_STATIC)" "0" OPENJPEG_H "${OPENJPEG_H}")
|
|
endif()
|
|
string(REPLACE "defined(DLL_EXPORT)" "0" OPENJPEG_H "${OPENJPEG_H}")
|
|
file(WRITE ${CURRENT_PACKAGES_DIR}/include/openjpeg.h "${OPENJPEG_H}")
|
|
|
|
# Handle copyright
|
|
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
|
|
|
vcpkg_copy_pdbs()
|