Merge branch 'aous72:master' into feature/add-openexr-support

Author: michaeldsmith

CMakeLists.txt

@@ -172,12 +172,24 @@ endif()
 
 include(GNUInstallDirs)
 
-install(EXPORT openjph-config
+install(EXPORT openjph-targets
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/openjph
 )
 
-install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc"
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+include(CMakePackageConfigHelpers)
+
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/src/openjph-config.cmake.in
+  "${CMAKE_CURRENT_BINARY_DIR}/openjph-config.cmake"
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/openjph
+)
+
+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/openjph-config-version.cmake
+                                 COMPATIBILITY SameMinorVersion)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openjph-config.cmake
+              ${CMAKE_CURRENT_BINARY_DIR}/openjph-config-version.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/openjph
+)
 
 if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
   set(PKG_CONFIG_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
@@ -192,21 +204,15 @@ else()
 endif()
 
 configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/src/pkg-config.pc.cmake"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/openjph.pc.in"
   "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc"
   @ONLY
 )
 
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/openjph-config-version.cmake
-                                 COMPATIBILITY SameMinorVersion)
-
-install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/openjph-config-version.cmake
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/openjph
+install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc"
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 
-
 ################################################################################################
 # Testing (OJPH_BUILD_TESTS)
 ################################################################################################
@@ -215,4 +221,3 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND OJPH_BUILD_TESTS)
   enable_testing()
   add_subdirectory(tests)
 endif()
-

src/apps/ojph_compress/CMakeLists.txt

@@ -105,6 +105,4 @@ target_link_libraries(ojph_compress PRIVATE openjph
   # ZLIB for OpenEXR 2.x:
   $<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>)
 
-install(TARGETS ojph_compress
-  EXPORT openjph-config
-)
+install(TARGETS ojph_compress)

src/apps/ojph_expand/CMakeLists.txt

@@ -105,6 +105,4 @@ target_link_libraries(ojph_expand PRIVATE openjph
   # ZLIB for OpenEXR 2.x:
   $<$<TARGET_EXISTS:ZLIB::ZLIB>:ZLIB::ZLIB>)
 
-install(TARGETS ojph_expand
-  EXPORT openjph-config
-)
+install(TARGETS ojph_expand)

src/apps/ojph_stream_expand/CMakeLists.txt

@@ -23,6 +23,4 @@ else()
     target_link_libraries(ojph_stream_expand PUBLIC openjph pthread)
 endif(MSVC)
 
-install(TARGETS ojph_stream_expand
-  EXPORT openjph-config
-)
+install(TARGETS ojph_stream_expand)

src/core/CMakeLists.txt

@@ -139,7 +139,7 @@ else()
 endif()
 
 install(TARGETS openjph
-  EXPORT openjph-config
+  EXPORT openjph-targets
 )
 
 install(DIRECTORY common/

src/openjph-config.cmake.in

@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/openjph-targets.cmake")
+
+check_required_components(openjph)