Merge pull request #1 from hjmallon/pr.hunter

Hunterize OpenEXR 2.4.0

Author: rbsheth

IlmBase/config/CMakeLists.txt

@@ -99,16 +99,21 @@ endif()
 # moral equivalent of a pkg-config file for cmake
 # and replaces the Find*.cmake of the "old" cmake
 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}
+)
 write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
   VERSION ${ILMBASE_VERSION}
   COMPATIBILITY SameMajorVersion
 )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${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}
 )
 install(EXPORT ${PROJECT_NAME}
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-  FILE ${PROJECT_NAME}Config.cmake
+  FILE ${PROJECT_NAME}Targets.cmake
   NAMESPACE ${PROJECT_NAME}::
   EXPORT_LINK_INTERFACE_LIBRARIES
 )

IlmBase/config/IlmBaseConfig.cmake.in

@@ -0,0 +1,4 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
+check_required_components("@PROJECT_NAME@")

IlmBase/config/LibraryDefine.cmake

@@ -94,6 +94,7 @@ function(ILMBASE_DEFINE_LIBRARY libname)
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    INCLUDES DESTINATION include
     PUBLIC_HEADER
       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${ILMBASE_OUTPUT_SUBDIR}
   )
@@ -143,6 +144,7 @@ function(ILMBASE_DEFINE_LIBRARY libname)
       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      INCLUDES DESTINATION include
     )
   endif()
 endfunction()

OpenEXR/CMakeLists.txt

@@ -1,6 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright Contributors to the OpenEXR Project.
 
+include("cmake/HunterGate.cmake")
+HunterGate(
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.242.tar.gz"
+    SHA1 "503b149d0ebdbc598e498f1669ae828a2136b838"
+)
+
 # We require this to get object library link library support and
 # combined python 2 + 3 support
 if(OPENEXR_BUILD_BOTH_STATIC_SHARED)
@@ -31,6 +37,7 @@ include(config/OpenEXRSetup.cmake)
 
 # Everyone depends on IlmBase, and we currently rely on
 # the version matched with our release
+hunter_add_package(IlmBase)
 find_package(IlmBase ${OPENEXR_VERSION} EXACT REQUIRED CONFIG)
 
 # generates config headers, package config files
@@ -44,7 +51,11 @@ include(config/LibraryDefine.cmake)
 
 add_subdirectory( IlmImf )
 add_subdirectory( IlmImfUtil )
-add_subdirectory( IlmImfExamples )
+
+option(INSTALL_OPENEXR_EXAMPLES "Install OpenEXR examples" ON)
+if(INSTALL_OPENEXR_EXAMPLES)
+  add_subdirectory( IlmImfExamples )
+endif()
 
 ##########################
 # Tests
@@ -74,4 +85,7 @@ if(OPENEXR_BUILD_UTILS)
   add_subdirectory( exrmultipart )
 endif()
 
-add_subdirectory(doc)
+option(INSTALL_OPENEXR_DOCS "Install OpenEXR documentation" ON)
+if(INSTALL_OPENEXR_DOCS)
+  add_subdirectory(doc)
+endif()