mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 20:57:49 +08:00
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
|
diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
|
||
|
|
index 5eeb7d3..3e8bfcb 100644
|
||
|
|
--- a/src/cmake/externalpackages.cmake
|
||
|
|
+++ b/src/cmake/externalpackages.cmake
|
||
|
|
@@ -336,7 +336,7 @@ if (USE_LIBRAW)
|
||
|
|
message (STATUS "Looking for LibRaw with ${LIBRAW_PATH}")
|
||
|
|
endif ()
|
||
|
|
find_package (LibRaw)
|
||
|
|
- if (LibRaw_r_LIBRARIES AND LibRaw_INCLUDE_DIR)
|
||
|
|
+ if (LibRaw_LIBRARIES AND LibRaw_INCLUDE_DIR)
|
||
|
|
set (LIBRAW_FOUND TRUE)
|
||
|
|
include_directories (${LibRaw_INCLUDE_DIR})
|
||
|
|
if (NOT LibRaw_FIND_QUIETLY)
|
||
|
|
@@ -350,7 +350,7 @@ if (USE_LIBRAW)
|
||
|
|
if (LINKSTATIC)
|
||
|
|
find_package (Jasper)
|
||
|
|
find_library (LCMS2_LIBRARIES NAMES lcms2)
|
||
|
|
- set (LibRaw_r_LIBRARIES ${LibRaw_r_LIBRARIES} ${JASPER_LIBRARIES} ${LCMS2_LIBRARIES})
|
||
|
|
+ set (LibRaw_LIBRARIES ${LibRaw_LIBRARIES} ${JASPER_LIBRARIES} ${LCMS2_LIBRARIES})
|
||
|
|
endif ()
|
||
|
|
else ()
|
||
|
|
message (STATUS "Not using LibRaw")
|
||
|
|
@@ -494,4 +494,3 @@ if (USE_DICOM)
|
||
|
|
endif()
|
||
|
|
# end DCMTK setup
|
||
|
|
###########################################################################
|
||
|
|
-
|
||
|
|
diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt
|
||
|
|
index e3608a2..f503035 100644
|
||
|
|
--- a/src/raw.imageio/CMakeLists.txt
|
||
|
|
+++ b/src/raw.imageio/CMakeLists.txt
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
if (USE_LIBRAW AND LIBRAW_FOUND)
|
||
|
|
add_oiio_plugin (rawinput.cpp
|
||
|
|
INCLUDE_DIRS ${LibRaw_INCLUDE_DIR}
|
||
|
|
- LINK_LIBRARIES ${LibRaw_r_LIBRARIES}
|
||
|
|
+ LINK_LIBRARIES ${LibRaw_LIBRARIES}
|
||
|
|
DEFINITIONS "-DUSE_LIBRAW=1")
|
||
|
|
else ()
|
||
|
|
message (WARNING "Raw plugin will not be built")
|