mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 02:35:49 +08:00
[libraw] Fix exported include dir (#32994)
This commit is contained in:
parent
48d0be929c
commit
9a2fae790b
32
ports/libraw/install-interface.patch
Normal file
32
ports/libraw/install-interface.patch
Normal file
@ -0,0 +1,32 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 484e76b..adbcd10 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -111,6 +111,9 @@ if(MSVC)
|
||||
add_definitions(-D_AFX_SECURE_NO_WARNINGS)
|
||||
endif()
|
||||
|
||||
+# For variables in $<INSTALL_INTERFACE:...>
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
# -- Check dependencies --------------------------------------------------------------------------------
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
|
||||
@@ -489,7 +492,7 @@ endif()
|
||||
|
||||
target_include_directories(raw
|
||||
PUBLIC
|
||||
- $<INSTALL_INTERFACE:libraw>
|
||||
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libraw>
|
||||
$<BUILD_INTERFACE:${LIBRAW_PATH}>)
|
||||
|
||||
target_link_libraries(raw PUBLIC ${MATH_LIBRARY})
|
||||
@@ -558,7 +561,7 @@ set_target_properties(raw_r PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||
target_link_libraries(raw_r PUBLIC ${MATH_LIBRARY})
|
||||
target_include_directories(raw_r
|
||||
PUBLIC
|
||||
- $<INSTALL_INTERFACE:libraw>
|
||||
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libraw>
|
||||
$<BUILD_INTERFACE:${LIBRAW_PATH}>)
|
||||
|
||||
if(WIN32)
|
@ -14,6 +14,7 @@ vcpkg_from_github(
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
dependencies.patch
|
||||
install-interface.patch
|
||||
# Move the non-thread-safe library to manual-link. This is unfortunately needed
|
||||
# because otherwise libraries that build on top of libraw have to choose.
|
||||
fix-install.patch
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "libraw",
|
||||
"version": "0.21.1",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "raw image decoder library",
|
||||
"homepage": "https://www.libraw.org",
|
||||
"license": "LGPL-2.1-only OR CDDL-1.0",
|
||||
|
@ -4522,7 +4522,7 @@
|
||||
},
|
||||
"libraw": {
|
||||
"baseline": "0.21.1",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"librdkafka": {
|
||||
"baseline": "2.2.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "ca8608b21d32cbd238b21eafc1ceb19ab91729b5",
|
||||
"version": "0.21.1",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "1b27d2a7401506c017a98e896c3dee2db0a01bfa",
|
||||
"version": "0.21.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user