diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-01-07 05:15:20 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-06 13:15:20 -0800 |
| commit | f21872a1f6de75e76558126225859101a1bb022c (patch) | |
| tree | dc219fc1dbaa12d5118f8370ec591ee81fff9ae9 | |
| parent | fb2006edf9b2b7338263abc629d59441b5da32d1 (diff) | |
| download | vcpkg-f21872a1f6de75e76558126225859101a1bb022c.tar.gz vcpkg-f21872a1f6de75e76558126225859101a1bb022c.zip | |
[freeimage libraw] Fix case issue on Linux (#8707)
* [freeimage libraw] fix build issue on linux
* Update the changes
| -rw-r--r-- | ports/freeimage/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/freeimage/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freeimage/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/libraw/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libraw/portfile.cmake | 9 |
5 files changed, 9 insertions, 12 deletions
diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt index af3d1c37f..f8fd96929 100644 --- a/ports/freeimage/CMakeLists.txt +++ b/ports/freeimage/CMakeLists.txt @@ -13,7 +13,7 @@ if(BUILD_SHARED_LIBS) add_definitions("-DOPENEXR_DLL") endif() -find_package(zlib REQUIRED) +find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) find_package(JPEG REQUIRED) find_package(TIFF REQUIRED) diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index c911df6c7..53e641a78 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -1,5 +1,5 @@ Source: freeimage -Version: 3.18.0-7 +Version: 3.18.0-8 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp[all] (!uwp), libraw, jxrlib, openexr Homepage: https://sourceforge.net/projects/freeimage/ Description: Support library for graphics image formats diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake index 237ed2466..1fcbbb110 100644 --- a/ports/freeimage/portfile.cmake +++ b/ports/freeimage/portfile.cmake @@ -52,8 +52,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -# Handle copyright -file(COPY ${SOURCE_PATH}/license-fi.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/freeimage) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/freeimage/license-fi.txt ${CURRENT_PACKAGES_DIR}/share/freeimage/copyright) - vcpkg_copy_pdbs() +file(INSTALL ${SOURCE_PATH}/license-fi.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL index 20b415a47..b5cbd7332 100644 --- a/ports/libraw/CONTROL +++ b/ports/libraw/CONTROL @@ -1,5 +1,5 @@ Source: libraw -Version: 201903-2 +Version: 201903-3 Build-Depends: lcms, jasper Homepage: https://www.libraw.org Description: raw image decoder library diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index 91cf2d736..73c60460e 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -70,14 +70,13 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Rename cmake module into a config in order to allow more flexible lookup rules -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libraw/FindLibRaw.cmake ${CURRENT_PACKAGES_DIR}/share/libraw/LibRaw-config.cmake) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libraw/FindLibRaw.cmake ${CURRENT_PACKAGES_DIR}/share/libraw/libraw-config.cmake) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/libraw) endif() -# Handle copyright -file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/libraw) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libraw/COPYRIGHT ${CURRENT_PACKAGES_DIR}/share/libraw/copyright) - vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + |