diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-12 02:30:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 02:30:59 -0700 |
| commit | 0e000644053015b7f7a0985e14f0bd384c847d17 (patch) | |
| tree | 7e456fd12b3bf281b28587338f1650017c8b32ab /ports/libraw | |
| parent | 93ce6b4f27602cd18f4327c2cfd84093d472b8bb (diff) | |
| parent | 39ba5b2b30c9f7b49e777a62093cdd49d05b53a9 (diff) | |
| download | vcpkg-0e000644053015b7f7a0985e14f0bd384c847d17.tar.gz vcpkg-0e000644053015b7f7a0985e14f0bd384c847d17.zip | |
Merge branch 'master' into master
Diffstat (limited to 'ports/libraw')
| -rw-r--r-- | ports/libraw/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libraw/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/libraw/vcpkg-cmake-wrapper.cmake | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL index ba378b8ff..8dc420fda 100644 --- a/ports/libraw/CONTROL +++ b/ports/libraw/CONTROL @@ -1,4 +1,4 @@ Source: libraw -Version: 0.19.0-2 +Version: 0.19.0-3 Build-Depends: lcms, jasper Description: raw image decoder library diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index 1ed02eab4..e62079ad3 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -79,6 +79,10 @@ 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) +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) diff --git a/ports/libraw/vcpkg-cmake-wrapper.cmake b/ports/libraw/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..c0ecc48f0 --- /dev/null +++ b/ports/libraw/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,7 @@ +_find_package(${ARGS})
+find_package(Jasper REQUIRED)
+if (Jasper_FOUND)
+ list(APPEND LibRaw_LIBRARIES ${JASPER_LIBRARIES})
+ list(APPEND LibRaw_r_LIBRARIES ${JASPER_LIBRARIES})
+endif ()
+
|