diff options
| author | codicodi <rob.ceglinski@gmail.com> | 2017-08-11 14:49:33 +0200 |
|---|---|---|
| committer | codicodi <rob.ceglinski@gmail.com> | 2017-08-11 16:49:47 +0200 |
| commit | 844df491b77304b9ef51492f670c4438064b731b (patch) | |
| tree | 72fb86fe05b85e225a7d8f76e6c9d0243a083da9 | |
| parent | f2c655c7dfa02fe0fcca4a6207f3f1cc55da540c (diff) | |
| download | vcpkg-844df491b77304b9ef51492f670c4438064b731b.tar.gz vcpkg-844df491b77304b9ef51492f670c4438064b731b.zip | |
[openjpeg] update to 2.2.0
| -rw-r--r-- | ports/openjpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openjpeg/portfile.cmake | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/ports/openjpeg/CONTROL b/ports/openjpeg/CONTROL index 15a56452e..7a1140c10 100644 --- a/ports/openjpeg/CONTROL +++ b/ports/openjpeg/CONTROL @@ -1,3 +1,3 @@ Source: openjpeg -Version: 2.1.2-2 +Version: 2.2.0 Description: JPEG 2000 image library diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake index 769f1410e..3f393fa97 100644 --- a/ports/openjpeg/portfile.cmake +++ b/ports/openjpeg/portfile.cmake @@ -1,17 +1,18 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openjpeg-2.1.2) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/uclouvain/openjpeg/archive/v2.1.2.zip" - FILENAME "openjpeg-2.1.2.zip" - SHA512 45518b92b2a8e7218ab3efdebe1acf0437c01ab2e4d5769da17103a76ba38a7305fb36d0ceeca0576d53c071a3482d2d3f01d6e48a569191290bfba9274ef7b4 +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO uclouvain/openjpeg + REF v2.2.0 + SHA512 20651c380bee582ab1950994c424cc00061ad852e9c5438fb32a9809e3f275571a4cc7e92589add0d91debf2394262e58f441c2dd918809fc1c602ed68396a3a + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DBUILD_CODEC:BOOL=OFF -DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg + -DOPENJPEG_INSTALL_INCLUDE_DIR=include ) vcpkg_install_cmake() @@ -20,14 +21,14 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets() -file(READ ${CURRENT_PACKAGES_DIR}/include/openjpeg-2.1/openjpeg.h OPENJPEG_H) +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-2.1/openjpeg.h "${OPENJPEG_H}") +file(WRITE ${CURRENT_PACKAGES_DIR}/include/openjpeg.h "${OPENJPEG_H}") # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openjpeg) |