diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-03-12 11:29:31 -0700 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-03-12 11:29:31 -0700 |
| commit | b29b874ae9007a4450b736cabbf3cd94a4ec6359 (patch) | |
| tree | 09a031509ccb697d20dc0745bae6541bb694a2b0 /ports/libraw | |
| parent | fe626490f0f3537fc85f47f76d5bcd16ea539dea (diff) | |
| parent | f24bd414ceeed5f4faad80405b87da4394c02d63 (diff) | |
| download | vcpkg-b29b874ae9007a4450b736cabbf3cd94a4ec6359.tar.gz vcpkg-b29b874ae9007a4450b736cabbf3cd94a4ec6359.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/5580
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 ()
+
|