aboutsummaryrefslogtreecommitdiff
path: root/ports/openexr
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2020-07-28 02:43:23 +0200
committerGitHub <noreply@github.com>2020-07-27 17:43:23 -0700
commitf1e7a3f167f9065a59e0c0ddb943a23506d646bd (patch)
treeb81e89f238b8c3dfb5080220e22f3e28668758ee /ports/openexr
parent458c20e94b9f558b523f187ce403bd062e131cdb (diff)
downloadvcpkg-f1e7a3f167f9065a59e0c0ddb943a23506d646bd.tar.gz
vcpkg-f1e7a3f167f9065a59e0c0ddb943a23506d646bd.zip
[opencv4] update to v4.3 (#11130)
* [opencv4] draft update to v4.3 * restore uwp patch * fix qt and ipp features * fix libepoxy and meson on osx * fix baseline, trigger a full rebuild due to meson tool changes * remove jpeg feature on windows due to a bug with MSVC * minor fixes for some features * ffmpeg x11 lib not required anymore on apple for downstream projects * small fixes for ogre and qt5 * remove a broken module * fix installation path * fix openexr which was broken and regressed opencv downstream projects * first round of ci passes * improve compatibility with android toolchain * [openexr] upgrade to v2.5.0 to fix regressions, might require fixes in dependent projects and might deserve its own PR * fix OpenEXR link for downstream projects * do not install unrequested features * fix compatibility with newer OpenEXR * [OpenCV3] update to v3.4.10 * fix openexr on windows, was creating symlinks that broke vcpkg * fix openexr wrapper * [openexr] cmake config files are installed into a lowered-case folder * remove mangled paths trying to fix android setup * disable dnn on android, fix mangled cmake config paths again * fix downstream CUDA dependency * fix compatibility with vs16.6 * remove from baseline ports now passing tests * [alembic] fixes for new openexr * fix baseline * [field3d] fixes for new openexr * [field3d] improve fixes, windows still unsupported despite what is said upstream * apply fixes required from review * add missing field3d patch * [field3d] disable mpi integration * [opencv2] remove cublas integration * [vtk] do not create libharu::libharu target if already existing * Update ports/opencv4/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/opencv3/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * improve compatibility with newer CUDNN * [OpenCV3, OpenCV4] improve compatibility with CUDA 11 * [OpenCV2] improve compatibility with CUDA 11 * [field3d] regenerate patch ignoring space at eol * [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (#11999) * [field3d] regenerate patch ignoring space at eol * [field3d] regenerate patch, again * [field3d] fixes for windows * [libass] fix regression * ci.baseline.txt update * [CUDA11] use FindCUDA from CMake 3.18 to ease transition later * re-bump vtk and ffmpeg, which were lost with merges from master * [OpenCV4] Halide feature is not broken anymore * [field3d] regenerate hdf5 patch * [OpenCV4] remove GTK features: it can be built only on *nix but GTK on vcpkg cannot be built on *nix systems... * merge ci.baseline.txt from master and fix field3d patch * remove rebuilding * restore vtk CONTROL file * update CONTROL files * Trigger rebuild * Update ports/freeimage/CONTROL * Update ports/freeimage/CONTROL * [opencv3/4] avoid tesseract dependency on uwp builds * [opencv] add missing module search Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/openexr')
-rw-r--r--ports/openexr/CONTROL6
-rw-r--r--ports/openexr/FindOpenEXR.cmake94
-rw-r--r--ports/openexr/fix_clang_not_setting_modern_cplusplus.patch13
-rw-r--r--ports/openexr/fix_install_ilmimf.patch19
-rw-r--r--ports/openexr/fix_linux_static_library_names.patch109
-rw-r--r--ports/openexr/fixup_cmake_exports_path.patch78
-rw-r--r--ports/openexr/portfile.cmake78
-rw-r--r--ports/openexr/remove_find_package_macro.patch87
-rw-r--r--ports/openexr/remove_symlinks.patch40
-rw-r--r--ports/openexr/vcpkg-cmake-wrapper.cmake40
10 files changed, 275 insertions, 289 deletions
diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL
index ddf7b0fbd..21481bda3 100644
--- a/ports/openexr/CONTROL
+++ b/ports/openexr/CONTROL
@@ -1,6 +1,6 @@
Source: openexr
-Version: 2.3.0-5
+Version: 2.5.0
Homepage: https://www.openexr.com/
Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications
-Build-Depends: zlib
-Supports: !uwp \ No newline at end of file
+Build-Depends: zlib, python3
+Supports: !uwp
diff --git a/ports/openexr/FindOpenEXR.cmake b/ports/openexr/FindOpenEXR.cmake
deleted file mode 100644
index f036c742e..000000000
--- a/ports/openexr/FindOpenEXR.cmake
+++ /dev/null
@@ -1,94 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-find_path(OpenEXR_INCLUDE_DIRS OpenEXR/OpenEXRConfig.h)
-find_path(OPENEXR_INCLUDE_PATHS NAMES ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
-
-file(STRINGS "${OpenEXR_INCLUDE_DIRS}/OpenEXR/OpenEXRConfig.h" OPENEXR_CONFIG_H)
-
-string(REGEX REPLACE "^.*define OPENEXR_VERSION_MAJOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MAJOR "${OPENEXR_CONFIG_H}")
-string(REGEX REPLACE "^.*define OPENEXR_VERSION_MINOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MINOR "${OPENEXR_CONFIG_H}")
-set(OpenEXR_LIB_SUFFIX "${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}")
-
-include(SelectLibraryConfigurations)
-
-if(NOT OpenEXR_BASE_LIBRARY)
- find_library(OpenEXR_BASE_LIBRARY_RELEASE NAMES IlmImf-${OpenEXR_LIB_SUFFIX})
- find_library(OpenEXR_BASE_LIBRARY_DEBUG NAMES IlmImf-${OpenEXR_LIB_SUFFIX}_d)
- select_library_configurations(OpenEXR_BASE)
-endif()
-
-if(NOT OpenEXR_UTIL_LIBRARY)
- find_library(OpenEXR_UTIL_LIBRARY_RELEASE NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX})
- find_library(OpenEXR_UTIL_LIBRARY_DEBUG NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX}_d)
- select_library_configurations(OpenEXR_UTIL)
-endif()
-
-if(NOT OpenEXR_HALF_LIBRARY)
- find_library(OpenEXR_HALF_LIBRARY_RELEASE NAMES Half-${OpenEXR_LIB_SUFFIX})
- find_library(OpenEXR_HALF_LIBRARY_DEBUG NAMES Half-${OpenEXR_LIB_SUFFIX}_d)
- select_library_configurations(OpenEXR_HALF)
-endif()
-
-if(NOT OpenEXR_IEX_LIBRARY)
- find_library(OpenEXR_IEX_LIBRARY_RELEASE NAMES Iex-${OpenEXR_LIB_SUFFIX})
- find_library(OpenEXR_IEX_LIBRARY_DEBUG NAMES Iex-${OpenEXR_LIB_SUFFIX}_d)
- select_library_configurations(OpenEXR_IEX)
-endif()
-
-if(NOT OpenEXR_MATH_LIBRARY)
- find_library(OpenEXR_MATH_LIBRARY_RELEASE NAMES Imath-${OpenEXR_LIB_SUFFIX})
- find_library(OpenEXR_MATH_LIBRARY_DEBUG NAMES Imath-${OpenEXR_LIB_SUFFIX}_d)
- select_library_configurations(OpenEXR_MATH)
-endif()
-
-if(NOT OpenEXR_THREAD_LIBRARY)
- find_library(OpenEXR_THREAD_LIBRARY_RELEASE NAMES IlmThread-${OpenEXR_LIB_SUFFIX})
- find_library(OpenEXR_THREAD_LIBRARY_DEBUG NAMES IlmThread-${OpenEXR_LIB_SUFFIX}_d)
- select_library_configurations(OpenEXR_THREAD)
-endif()
-
-if(NOT OpenEXR_IEXMATH_LIBRARY)
- find_library(OpenEXR_IEXMATH_LIBRARY_RELEASE NAMES IexMath-${OpenEXR_LIB_SUFFIX})
- find_library(OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES IexMath-${OpenEXR_LIB_SUFFIX}_d)
- select_library_configurations(OpenEXR_IEXMATH)
-endif()
-
-set(OPENEXR_HALF_LIBRARY "${OpenEXR_HALF_LIBRARY}")
-set(OPENEXR_Half_LIBRARY "${OpenEXR_HALF_LIBRARY}")
-set(OPENEXR_IEX_LIBRARY "${OpenEXR_IEX_LIBRARY}")
-set(OPENEXR_Iex_LIBRARY "${OpenEXR_IEX_LIBRARY}")
-set(OPENEXR_IMATH_LIBRARY "${OpenEXR_MATH_LIBRARY}")
-set(OPENEXR_ILMIMF_LIBRARY "${OpenEXR_BASE_LIBRARY}")
-set(OPENEXR_IlmImf_LIBRARY "${OpenEXR_BASE_LIBRARY}")
-set(OPENEXR_ILMIMFUTIL_LIBRARY "${OpenEXR_UTIL_LIBRARY}")
-set(OPENEXR_ILMTHREAD_LIBRARY "${OpenEXR_THREAD_LIBRARY}")
-
-set(OpenEXR_LIBRARY "${OpenEXR_BASE_LIBRARY}")
-
-set(OpenEXR_LIBRARIES
- ${OpenEXR_LIBRARY}
- ${OpenEXR_MATH_LIBRARY}
- ${OpenEXR_IEXMATH_LIBRARY}
- ${OpenEXR_UTIL_LIBRARY}
- ${OpenEXR_HALF_LIBRARY}
- ${OpenEXR_IEX_LIBRARY}
- ${OpenEXR_THREAD_LIBRARY}
-)
-
-set(OPENEXR_LIBRARIES
- ${OPENEXR_HALF_LIBRARY}
- ${OPENEXR_IEX_LIBRARY}
- ${OPENEXR_IMATH_LIBRARY}
- ${OPENEXR_ILMIMF_LIBRARY}
- ${OPENEXR_ILMTHREAD_LIBRARY}
-)
-
-set(OpenEXR_INCLUDE_DIR ${OpenEXR_INCLUDE_DIRS})
-set(OPENEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIRS})
-set(OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATHS})
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR REQUIRED_VARS OpenEXR_LIBRARIES OpenEXR_INCLUDE_DIRS)
-
-if(OpenEXR_FOUND)
- set(OPENEXR_FOUND 1)
-endif()
diff --git a/ports/openexr/fix_clang_not_setting_modern_cplusplus.patch b/ports/openexr/fix_clang_not_setting_modern_cplusplus.patch
deleted file mode 100644
index 05e86b50c..000000000
--- a/ports/openexr/fix_clang_not_setting_modern_cplusplus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt
-index e13c768..95942c8 100644
---- a/IlmBase/CMakeLists.txt
-+++ b/IlmBase/CMakeLists.txt
-@@ -110,7 +110,7 @@ ENDIF ()
-
- IF (OPENEXR_FORCE_CXX03)
- FILE ( APPEND ${ILMBASE_TMP_CONFIG} "#define ILMBASE_FORCE_CXX03 1\n" )
--ELSEIF (NOT WIN32)
-+ELSEIF (NOT WIN32 AND NOT APPLE)
- # really only care about c++11 right now for the threading bits, but this can be changed to 14
- # when needed...
- # Note that the __cplusplus check is not valid under MSVC
diff --git a/ports/openexr/fix_install_ilmimf.patch b/ports/openexr/fix_install_ilmimf.patch
deleted file mode 100644
index db65be736..000000000
--- a/ports/openexr/fix_install_ilmimf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/OpenEXR/IlmImf/CMakeLists.txt b/OpenEXR/IlmImf/CMakeLists.txt
-index e1a8740..d31cf68 100644
---- a/OpenEXR/IlmImf/CMakeLists.txt
-+++ b/OpenEXR/IlmImf/CMakeLists.txt
-@@ -2,14 +2,6 @@
-
- SET(CMAKE_INCLUDE_CURRENT_DIR 1)
-
--IF (WIN32)
-- SET(RUNTIME_DIR ${OPENEXR_PACKAGE_PREFIX}/bin)
-- SET(WORKING_DIR ${RUNTIME_DIR})
--ELSE ()
-- SET(RUNTIME_DIR ${OPENEXR_PACKAGE_PREFIX}/lib)
-- SET(WORKING_DIR .)
--ENDIF ()
--
- SET(BUILD_B44EXPLOGTABLE OFF)
- IF (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h")
- SET(BUILD_B44EXPLOGTABLE ON)
diff --git a/ports/openexr/fix_linux_static_library_names.patch b/ports/openexr/fix_linux_static_library_names.patch
deleted file mode 100644
index e7a41daa7..000000000
--- a/ports/openexr/fix_linux_static_library_names.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b06d97e..ad360f8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,10 +53,13 @@ endif()
- if (WIN32 AND OPENEXR_BUILD_ILMBASE AND OPENEXR_BUILD_OPENEXR AND OPENEXR_BUILD_SHARED)
- # necessary for building dwa lookup tables, and b44log tables on windows
- set(BUILD_ILMBASE_STATIC ON)
-+ set(OPENEXR_STATIC_SUFFIX "_s")
- elseif (OPENEXR_BUILD_ILMBASE AND OPENEXR_BUILD_STATIC)
- set(BUILD_ILMBASE_STATIC ON)
-+ set(OPENEXR_STATIC_SUFFIX "")
- else()
- set(BUILD_ILMBASE_STATIC OFF)
-+ set(OPENEXR_STATIC_SUFFIX "")
- endif()
-
- if (NOT OPENEXR_BUILD_SHARED)
-diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt
-index 3d24cd7..d92aa67 100644
---- a/IlmBase/Half/CMakeLists.txt
-+++ b/IlmBase/Half/CMakeLists.txt
-@@ -60,7 +60,7 @@ IF (BUILD_ILMBASE_STATIC)
- SET_TARGET_PROPERTIES ( Half_static
- PROPERTIES
- VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}
-- OUTPUT_NAME "Half${ILMBASE_LIBSUFFIX}_s"
-+ OUTPUT_NAME "Half${ILMBASE_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
- )
-
- ADD_DEPENDENCIES ( Half_static toFloat eLut )
-diff --git a/IlmBase/Iex/CMakeLists.txt b/IlmBase/Iex/CMakeLists.txt
-index 847518c..9425430 100644
---- a/IlmBase/Iex/CMakeLists.txt
-+++ b/IlmBase/Iex/CMakeLists.txt
-@@ -34,7 +34,7 @@ IF (BUILD_ILMBASE_STATIC)
- SET_TARGET_PROPERTIES ( Iex_static
- PROPERTIES
- VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}
-- OUTPUT_NAME "Iex${ILMBASE_LIBSUFFIX}_s"
-+ OUTPUT_NAME "Iex${ILMBASE_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
- )
- ENDIF()
-
-diff --git a/IlmBase/IexMath/CMakeLists.txt b/IlmBase/IexMath/CMakeLists.txt
-index 472fd33..1427fa8 100644
---- a/IlmBase/IexMath/CMakeLists.txt
-+++ b/IlmBase/IexMath/CMakeLists.txt
-@@ -36,7 +36,7 @@ IF (BUILD_ILMBASE_STATIC)
- SET_TARGET_PROPERTIES ( IexMath_static
- PROPERTIES
- VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}
-- OUTPUT_NAME "IexMath${ILMBASE_LIBSUFFIX}_s"
-+ OUTPUT_NAME "IexMath${ILMBASE_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
- )
- ENDIF( )
-
-diff --git a/IlmBase/IlmThread/CMakeLists.txt b/IlmBase/IlmThread/CMakeLists.txt
-index 3a24823..b281916 100644
---- a/IlmBase/IlmThread/CMakeLists.txt
-+++ b/IlmBase/IlmThread/CMakeLists.txt
-@@ -49,7 +49,7 @@ IF (BUILD_ILMBASE_STATIC)
- SET_TARGET_PROPERTIES ( IlmThread_static
- PROPERTIES
- VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}
-- OUTPUT_NAME "IlmThread${ILMBASE_LIBSUFFIX}_s"
-+ OUTPUT_NAME "IlmThread${ILMBASE_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
- )
- ENDIF ()
-
-diff --git a/IlmBase/Imath/CMakeLists.txt b/IlmBase/Imath/CMakeLists.txt
-index 8faa97a..bf29000 100644
---- a/IlmBase/Imath/CMakeLists.txt
-+++ b/IlmBase/Imath/CMakeLists.txt
-@@ -37,7 +37,7 @@ IF (BUILD_ILMBASE_STATIC)
- SET_TARGET_PROPERTIES ( Imath_static
- PROPERTIES
- VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}
-- OUTPUT_NAME "Imath${ILMBASE_LIBSUFFIX}_s"
-+ OUTPUT_NAME "Imath${ILMBASE_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
- )
- ENDIF ()
-
-diff --git a/OpenEXR/IlmImf/CMakeLists.txt b/OpenEXR/IlmImf/CMakeLists.txt
-index d31cf68..52c2b6e 100644
---- a/OpenEXR/IlmImf/CMakeLists.txt
-+++ b/OpenEXR/IlmImf/CMakeLists.txt
-@@ -226,7 +226,7 @@ IF (OPENEXR_BUILD_STATIC)
- SET_TARGET_PROPERTIES ( IlmImf_static
- PROPERTIES
- VERSION ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}
-- OUTPUT_NAME "IlmImf${OPENEXR_LIBSUFFIX}_s"
-+ OUTPUT_NAME "IlmImf${OPENEXR_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
- )
- SET_ILMBASE_INCLUDE_DIRS(IlmImf_static)
-
-diff --git a/OpenEXR/IlmImfUtil/CMakeLists.txt b/OpenEXR/IlmImfUtil/CMakeLists.txt
-index 4cc53de..26df90e 100644
---- a/OpenEXR/IlmImfUtil/CMakeLists.txt
-+++ b/OpenEXR/IlmImfUtil/CMakeLists.txt
-@@ -60,7 +60,7 @@ IF ( OPENEXR_BUILD_STATIC )
- PROPERTIES
- VERSION ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}
- SOVERSION ${OPENEXR_SOVERSION}
-- OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}_s"
-+ OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
- )
- ENDIF()
-
diff --git a/ports/openexr/fixup_cmake_exports_path.patch b/ports/openexr/fixup_cmake_exports_path.patch
new file mode 100644
index 000000000..e39bd3792
--- /dev/null
+++ b/ports/openexr/fixup_cmake_exports_path.patch
@@ -0,0 +1,78 @@
+diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt
+index d9c5ae4..45ee6cc 100644
+--- a/IlmBase/config/CMakeLists.txt
++++ b/IlmBase/config/CMakeLists.txt
+@@ -105,7 +105,7 @@ endif()
+ include(CMakePackageConfigHelpers)
+ configure_package_config_file(IlmBaseConfig.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ INSTALL_DESTINATION share/ilmbase
+ )
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ VERSION ${ILMBASE_VERSION}
+@@ -113,10 +113,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ )
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION share/ilmbase
+ )
+ install(EXPORT ${PROJECT_NAME}
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION share/ilmbase
+ FILE ${PROJECT_NAME}Targets.cmake
+ NAMESPACE ${PROJECT_NAME}::
+ EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt
+index b52ad0d..3dc6d22 100644
+--- a/OpenEXR/config/CMakeLists.txt
++++ b/OpenEXR/config/CMakeLists.txt
+@@ -19,7 +19,7 @@ int main()
+ sysconf(_SC_NPROCESSORS_ONLN);
+ }
+ " OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN
+-)
++)
+
+ check_cxx_source_compiles(
+ "
+@@ -100,7 +100,7 @@ endif()
+ include(CMakePackageConfigHelpers)
+ configure_package_config_file(OpenEXRConfig.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ INSTALL_DESTINATION share/openexr
+ )
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ VERSION ${OPENEXR_VERSION}
+@@ -108,10 +108,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ )
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION share/openexr
+ )
+ install(EXPORT ${PROJECT_NAME}
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION share/openexr
+ FILE ${PROJECT_NAME}Targets.cmake
+ NAMESPACE ${PROJECT_NAME}::
+ EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt
+index 1872c89..bc61f43 100644
+--- a/PyIlmBase/config/CMakeLists.txt
++++ b/PyIlmBase/config/CMakeLists.txt
+@@ -39,10 +39,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ COMPATIBILITY SameMajorVersion
+ )
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION share/pyilmbase
+ )
+ install(EXPORT ${PROJECT_NAME}
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION share/pyilmbase
+ FILE ${PROJECT_NAME}Config.cmake
+ NAMESPACE ${PROJECT_NAME}::
+ EXPORT_LINK_INTERFACE_LIBRARIES
diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake
index 31b0582ed..d73520cea 100644
--- a/ports/openexr/portfile.cmake
+++ b/ports/openexr/portfile.cmake
@@ -1,65 +1,49 @@
-include(vcpkg_common_functions)
-
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "UWP build not supported")
endif()
-set(OPENEXR_VERSION 2.3.0)
-set(OPENEXR_HASH 268ae64b40d21d662f405fba97c307dad1456b7d996a447aadafd41b640ca736d4851d9544b4741a94e7b7c335fe6e9d3b16180e710671abfc0c8b2740b147b2)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO openexr/openexr
- REF v${OPENEXR_VERSION}
- SHA512 ${OPENEXR_HASH}
+ REF ed64d5467dee9763f28baf300f7699e6288b9f5f
+ SHA512 549d37ed1ef4d1ff7e732d583f7213ee15c7f92625aea9fd65345e4c5b854902c02e5940d0692b1af5ae0a02abf46aaefea2662db2389d1b2fb4264a373baac2
HEAD_REF master
PATCHES
- fix_clang_not_setting_modern_cplusplus.patch
- fix_install_ilmimf.patch
- fix_linux_static_library_names.patch
+ remove_find_package_macro.patch
+ fixup_cmake_exports_path.patch
+ remove_symlinks.patch
)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OPENEXR_BUILD_STATIC)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPENEXR_BUILD_SHARED)
-
vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
- -DOPENEXR_BUILD_PYTHON_LIBS:BOOL=FALSE
- -DOPENEXR_BUILD_STATIC=${OPENEXR_BUILD_STATIC}
- -DOPENEXR_BUILD_SHARED=${OPENEXR_BUILD_SHARED}
- OPTIONS_DEBUG
- -DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR}/debug
- OPTIONS_RELEASE
- -DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR})
+ -DCMAKE_DEBUG_POSTFIX=_d
+ -DPYILMBASE_ENABLE=FALSE
+)
vcpkg_install_cmake()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/ilmbase TARGET_PATH share/ilmbase)
+vcpkg_fixup_cmake_targets()
+
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX})
-# NOTE: Only use ".exe" extension on Windows executables.
-# Is there a cleaner way to do this?
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- set(EXECUTABLE_SUFFIX ".exe")
-else()
- set(EXECUTABLE_SUFFIX "")
-endif()
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmakepreview${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmaketiled${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultipart${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultiview${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrstdattr${EXECUTABLE_SUFFIX})
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openexr/)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrenvmap${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrenvmap${EXECUTABLE_SUFFIX})
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrheader${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrheader${EXECUTABLE_SUFFIX})
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmakepreview${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmakepreview${EXECUTABLE_SUFFIX})
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmaketiled${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmaketiled${EXECUTABLE_SUFFIX})
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultipart${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultipart${EXECUTABLE_SUFFIX})
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultiview${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultiview${EXECUTABLE_SUFFIX})
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrstdattr${EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX})
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openexr)
vcpkg_copy_pdbs()
@@ -68,6 +52,8 @@ if (VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindOpenEXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/openexr/remove_find_package_macro.patch b/ports/openexr/remove_find_package_macro.patch
new file mode 100644
index 000000000..967e89a83
--- /dev/null
+++ b/ports/openexr/remove_find_package_macro.patch
@@ -0,0 +1,87 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 111a603..109394f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,22 +25,12 @@ endif()
+ project(OpenEXRMetaProject)
+
+
+-# An "official" way to make this a super-project
+-# basically overrides the find_package to not find anything
+-# for stuff we're including locally
+-set(as_subproject IlmBase OpenEXR)
+-macro(find_package)
+- if(NOT "${ARGV0}" IN_LIST as_subproject)
+- _find_package(${ARGV})
+- endif()
+-endmacro()
+-
+
+ # If you want to use ctest to configure, build and
+ # upload the results, cmake has builtin support for
+ # submitting to CDash, or any server who speaks the
+ # same protocol
+-#
++#
+ # These settings will need to be set for your environment,
+ # and then a script such as the example in
+ #
+@@ -51,7 +41,7 @@ endmacro()
+ # cmake -S cmake/SampleCTestScript.cmake
+ #
+ # [or whatever you name the file you edit]
+-#
++#
+ #set(CTEST_PROJECT_NAME "OpenEXR")
+ #set(CTEST_NIGHTLY_START_TIME "01:01:01 UTC")
+ #set(CTEST_DROP_METHOD "http") # there are others...
+diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt
+index 390b27f..87b2d01 100644
+--- a/OpenEXR/CMakeLists.txt
++++ b/OpenEXR/CMakeLists.txt
+@@ -35,7 +35,6 @@ include(config/OpenEXRSetup.cmake)
+
+ # Everyone depends on IlmBase, and we currently rely on
+ # the version matched with our release
+-find_package(IlmBase ${OPENEXR_VERSION} EXACT REQUIRED CONFIG)
+
+ # generates config headers, package config files
+ add_subdirectory(config)
+diff --git a/OpenEXR/config/OpenEXRSetup.cmake b/OpenEXR/config/OpenEXRSetup.cmake
+index 5116726..34c7c87 100644
+--- a/OpenEXR/config/OpenEXRSetup.cmake
++++ b/OpenEXR/config/OpenEXRSetup.cmake
+@@ -33,7 +33,7 @@ endif()
+ # Whether to build & install the various command line utility programs
+ option(OPENEXR_BUILD_UTILS "Enables building of utility programs" ON)
+
+-# This is a variable here for use in controlling where include files are
++# This is a variable here for use in controlling where include files are
+ # installed. Care must be taken when changing this, as many things
+ # probably assume this is OpenEXR
+ set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destination sub-folder of the include path for install")
+diff --git a/OpenEXR_Viewers/CMakeLists.txt b/OpenEXR_Viewers/CMakeLists.txt
+index 5efa353..5246fa7 100644
+--- a/OpenEXR_Viewers/CMakeLists.txt
++++ b/OpenEXR_Viewers/CMakeLists.txt
+@@ -24,8 +24,6 @@ project(OpenEXR_Viewers VERSION ${OPENEXR_VIEWERS_VERSION})
+ #######################################
+ include(config/OpenEXRViewersSetup.cmake)
+
+-find_package(IlmBase ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG)
+-find_package(OpenEXR ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG)
+
+ # This is for newer cmake versions who know about vendor versions
+ set(OpenGL_GL_PREFERENCE GLVND)
+diff --git a/PyIlmBase/CMakeLists.txt b/PyIlmBase/CMakeLists.txt
+index 291b96e..7d5074f 100644
+--- a/PyIlmBase/CMakeLists.txt
++++ b/PyIlmBase/CMakeLists.txt
+@@ -27,7 +27,6 @@ project(PyIlmBase VERSION ${PYILMBASE_VERSION} LANGUAGES C CXX)
+ include(config/PyIlmBaseSetup.cmake)
+
+ # we have a strong dependence on IlmBase being an exact match
+-find_package(IlmBase ${PYILMBASE_VERSION} EXACT REQUIRED CONFIG)
+
+ # we are building a python extension, so of course we depend on
+ # python as well. Except we don't know which version...
diff --git a/ports/openexr/remove_symlinks.patch b/ports/openexr/remove_symlinks.patch
new file mode 100644
index 000000000..89b9c53f3
--- /dev/null
+++ b/ports/openexr/remove_symlinks.patch
@@ -0,0 +1,40 @@
+diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake
+index 44254a7..1f5d2a6 100644
+--- a/IlmBase/config/LibraryDefine.cmake
++++ b/IlmBase/config/LibraryDefine.cmake
+@@ -101,15 +101,6 @@ function(ILMBASE_DEFINE_LIBRARY libname)
+ if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL ""))
+ set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX})
+- if(WIN32)
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
+- else()
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
+- endif()
+- set(verlibname)
+- set(baselibname)
+ endif()
+
+ if(ILMBASE_BUILD_BOTH_STATIC_SHARED)
+diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake
+index a9561dc..42853af 100644
+--- a/OpenEXR/config/LibraryDefine.cmake
++++ b/OpenEXR/config/LibraryDefine.cmake
+@@ -95,15 +95,6 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+ if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL ""))
+ set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX})
+- if(WIN32)
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
+- else()
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")")
+- endif()
+- set(verlibname)
+- set(baselibname)
+ endif()
+
+ if(OPENEXR_BUILD_BOTH_STATIC_SHARED)
diff --git a/ports/openexr/vcpkg-cmake-wrapper.cmake b/ports/openexr/vcpkg-cmake-wrapper.cmake
index a977a420e..479cd3027 100644
--- a/ports/openexr/vcpkg-cmake-wrapper.cmake
+++ b/ports/openexr/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,38 @@
-set(OPENEXR_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+_find_package(${ARGS})
-if(NOT OpenEXR_LIBRARIES OR OPENEXR_LIBRARIES)
- _find_package(${ARGS})
+if(TARGET OpenEXR::IlmImf AND NOT OPENEXR_LIBRARIES AND NOT OPENEXR_FOUND)
+ set(OPENEXR_FOUND TRUE CACHE BOOL "")
+ set(OpenEXR_FOUND TRUE CACHE BOOL "")
+ set(OPENEXR_VERSION "2.5.0" CACHE STRING "")
+ set(OpenEXR_VERSION "2.5.0" CACHE STRING "")
+ get_target_property(OpenEXR_INCLUDE_DIRS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES)
+ get_target_property(OPENEXR_INCLUDE_PATHS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES)
+ get_target_property(OPENEXR_INCLUDE_DIRS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES)
+ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES)
+ set(OpenEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIRS} CACHE STRING "")
+ set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATHS} CACHE STRING "")
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIRS} CACHE STRING "")
+ set(OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_DIR} CACHE STRING "")
+ set(OPENEXR_ILMIMF_LIBRARY "OpenEXR::IlmImf" CACHE STRING "")
+ set(OPENEXR_ILMIMFUTIL_LIBRARY "OpenEXR::IlmImfUtil" CACHE STRING "")
+ set(OPENEXR_LIBRARIES ${OPENEXR_ILMIMFUTIL_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} CACHE STRING "")
endif()
-set(CMAKE_MODULE_PATH ${OPENEXR_PREV_MODULE_PATH})
+if(TARGET IlmBase::Half AND NOT ILMBASE_LIBRARIES AND NOT ILMBASE_FOUND)
+ set(ILMBASE_FOUND TRUE CACHE BOOL "")
+ set(IlmBASE_FOUND TRUE CACHE BOOL "")
+ set(ILMBASE_VERSION "2.5.0" CACHE STRING "")
+ set(IlmBASE_VERSION "2.5.0" CACHE STRING "")
+ get_target_property(ILMBASE_INCLUDE_DIR IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES)
+ get_target_property(ILMBASE_INCLUDE_DIRS IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES)
+ get_target_property(ILMBASE_INCLUDE_PATHS IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES)
+ set(ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_DIR} CACHE STRING "")
+ set(ILMBASE_INCLUDE_DIRS ${ILMBASE_INCLUDE_DIRS} CACHE STRING "")
+ set(ILMBASE_INCLUDE_PATHS ${ILMBASE_INCLUDE_PATHS} CACHE STRING "")
+ set(OPENEXR_HALF_LIBRARY "IlmBase::Half" CACHE STRING "")
+ set(OPENEXR_IEX_LIBRARY "IlmBase::Iex" CACHE STRING "")
+ set(OPENEXR_IEXMATH_LIBRARY "IlmBase::IexMath" CACHE STRING "")
+ set(OPENEXR_ILMTHREAD_LIBRARY "IlmBase::IlmThread" CACHE STRING "")
+ set(OPENEXR_IMATH_LIBRARY "IlmBase::Imath" CACHE STRING "")
+ set(ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IEXMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "")
+endif()