gdal, oiio, aff update

gruppe-adler · Oct 9, 2021 · daf8602 · daf8602
1 parent ffa75fb
commit daf8602
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -54,6 +54,7 @@ if (NOT TARGET Libsquish::Libsquish)
 endif ()
 
 find_package(OpenEXR CONFIG)
+find_package(PNG MODULE)
 find_package(OpenImageIO CONFIG REQUIRED)
 
 # GADL
@@ -108,7 +109,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_library(${INTERCEPT_PLUGIN_NAME} SHARED ${INTERCEPT_PLUGIN_SOURCES} ${INTERCEPT_HOST_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/version.cpp)
 
 target_include_directories(${INTERCEPT_PLUGIN_NAME} PUBLIC ${OPENIMAGEIO_INCLUDE_DIR})
-target_link_libraries(${INTERCEPT_PLUGIN_NAME} GDAL::GDAL)
+target_link_libraries(${INTERCEPT_PLUGIN_NAME} ${GDAL_LIBRARIES})
 target_link_libraries(${INTERCEPT_PLUGIN_NAME} OpenImageIO::OpenImageIO OpenImageIO::OpenImageIO_Util)
 target_link_libraries(${INTERCEPT_PLUGIN_NAME} ${Boost_LIBRARIES})
 target_link_libraries(${INTERCEPT_PLUGIN_NAME} nlohmann_json nlohmann_json::nlohmann_json)

diff --git a/src/satimages.cpp b/src/satimages.cpp
@@ -3,7 +3,7 @@
 #include <OpenImageIO/imagebuf.h>
 #include <OpenImageIO/imagebufalgo.h>
 
-using namespace OpenImageIO_v2_1;
+using namespace OpenImageIO_v2_3;
 
 // Range TODO: replace with C++20 Range
 #include <boost/range/counting_range.hpp>