mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 11:53:03 +08:00
[charls] upgrade to 2.1.0 (#9494)
* [charls] upgrade to 2.1.0 Upgrade to the latest released version of CharLS. The patch file has become obsolete. * Remove charls=fail triplets from ci.baseline.txt Both arm-uwp and x64-uwp can be build.
This commit is contained in:
parent
2a0998e5cf
commit
8b07958e8b
@ -1,12 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 1aa40a8..1051997 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -33,6 +33,7 @@ option (BUILD_TESTING "Build tests" ON)
|
|
||||||
if (WIN32)
|
|
||||||
if (BUILD_SHARED_LIBS)
|
|
||||||
add_definitions(-D CHARLS_DLL)
|
|
||||||
+ set_source_files_properties(src/interface.cpp PROPERTIES COMPILE_FLAGS -DCHARLS_DLL_BUILD)
|
|
||||||
else()
|
|
||||||
add_definitions(-D CHARLS_STATIC)
|
|
||||||
endif()
|
|
@ -1,4 +1,4 @@
|
|||||||
Source: charls
|
Source: charls
|
||||||
Version: 2.0.0-3
|
Version: 2.1.0-1
|
||||||
Homepage: https://github.com/team-charls/charls
|
Homepage: https://github.com/team-charls/charls
|
||||||
Description: CharLS, a C++ JPEG-LS library implementation.
|
Description: CharLS, a C++ JPEG-LS library implementation.
|
@ -3,24 +3,23 @@ include(vcpkg_common_functions)
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO team-charls/charls
|
REPO team-charls/charls
|
||||||
REF 2.0.0
|
REF 2.1.0
|
||||||
SHA512 0a2862fad6d65b941c81f5f838db1fdc6a4625887281ddbf27e21be9084f607d27c8a27d246d6252e08358b2ed4aa0c2b7407048ca559fb40e94313ca72487dd
|
SHA512 456539243d984ebe6afe1bbb7c9422e642cf0346d25d220126ad8a6d04e945c6c340ab3c2b73a7db4ec390ed6a52236e5c6e9ad6d14e8b78b701937810fb327d
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
|
||||||
0001_cmake.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_configure_cmake(
|
vcpkg_configure_cmake(
|
||||||
SOURCE_PATH ${SOURCE_PATH}
|
SOURCE_PATH ${SOURCE_PATH}
|
||||||
PREFER_NINJA
|
PREFER_NINJA
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-DBUILD_TESTING=OFF
|
-DCHARLS_BUILD_TESTS=OFF
|
||||||
|
-DCHARLS_BUILD_SAMPLES=OFF
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_install_cmake()
|
vcpkg_install_cmake()
|
||||||
|
|
||||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||||
|
|
||||||
file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||||
|
|
||||||
vcpkg_copy_pdbs()
|
vcpkg_copy_pdbs()
|
||||||
|
@ -213,8 +213,6 @@ chakracore:x64-linux=fail
|
|||||||
chakracore:x64-osx=fail
|
chakracore:x64-osx=fail
|
||||||
chakracore:x64-uwp=fail
|
chakracore:x64-uwp=fail
|
||||||
chakracore:x64-windows-static=fail
|
chakracore:x64-windows-static=fail
|
||||||
charls:arm-uwp=fail
|
|
||||||
charls:x64-uwp=fail
|
|
||||||
chartdir:arm64-windows=fail
|
chartdir:arm64-windows=fail
|
||||||
chartdir:arm-uwp=fail
|
chartdir:arm-uwp=fail
|
||||||
chartdir:x64-uwp=fail
|
chartdir:x64-uwp=fail
|
||||||
|
Loading…
Reference in New Issue
Block a user