Initial fix for broken CMake config files

Author: mikaelsundell

CMakeLists.txt

@@ -67,7 +67,6 @@ endif ()
 
 include ( configure.cmake )
 
-
 # generated config files end up in binary dir so to find them, need
 # to add to include path
 include_directories( "${PROJECT_SOURCE_DIR}/include" )
@@ -76,29 +75,6 @@ add_definitions( -DPACKAGE="RAWTOACES" -DVERSION="${RAWTOACES_VERSION}" )
 add_subdirectory("src/${RAWTOACESIDTLIB}")
 add_subdirectory("src/${RAWTOACESLIB}")
 
-
- 
-# Create a RAWTOACESBuildTreeSettings.cmake file for the use from the build tree
-file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}")
-configure_file(config/RAWTOACESBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/RAWTOACESBuildTreeSettings.cmake" @ONLY)
-configure_file(config/RAWTOACESConfig.cmake.in "${PROJECT_BINARY_DIR}/RAWTOACESConfig.cmake" @ONLY)
-configure_file(config/RAWTOACESConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/RAWTOACESConfigVersion.cmake" @ONLY)
-
-if ( PKG_CONFIG_FOUND )
-  configure_file(config/RAWTOACES.pc.in "${PROJECT_BINARY_DIR}/RAWTOACES.pc" @ONLY)
-  install( FILES "${PROJECT_BINARY_DIR}/RAWTOACES.pc" DESTINATION lib/pkgconfig COMPONENT dev )
-endif()
-
-install( FILES
-  "${PROJECT_BINARY_DIR}/RAWTOACESConfig.cmake"
-  "${PROJECT_BINARY_DIR}/RAWTOACESConfigVersion.cmake"
-  DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
-
-if ( WIN32 AND NOT CYGWIN )
-install( FILES "${PROJECT_BINARY_DIR}/RAWTOACESLibraryDepends.cmake" DESTINATION
-  "${INSTALL_CMAKE_DIR}" COMPONENT dev )
-endif( )
-
 if ( APPLE OR UNIX )
 	install (DIRECTORY data DESTINATION include/rawtoaces)
 endif()
@@ -133,13 +109,52 @@ add_subdirectory(unittest)
 
 install( TARGETS rawtoaces DESTINATION bin )
 
-# uninstall target
-configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
+include( GNUInstallDirs )
+include( CMakePackageConfigHelpers )
+
+if ( PKG_CONFIG_FOUND )
+   configure_file (config/RAWTOACES.pc.in "${PROJECT_BINARY_DIR}/RAWTOACES.pc" @ONLY )
+   install (FILES "${PROJECT_BINARY_DIR}/RAWTOACES.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev )
+endif ()
+
+file( WRITE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake" "# Dummy file" )
+
+write_basic_package_version_file(
+    "${PROJECT_NAME}ConfigVersion.cmake"
+    VERSION ${RAWTOACES_VERSION}
+    COMPATIBILITY SameMajorVersion
+)
+
+configure_package_config_file(
+    config/${PROJECT_NAME}Config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
 
-add_custom_target(uninstall
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+install(
+    TARGETS ${RAWTOACESIDTLIB} ${RAWTOACESLIB}
+    EXPORT ${PROJECT_NAME}Targets
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    PUBLIC_HEADER
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+)
 
+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}Targets
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+    FILE ${PROJECT_NAME}Targets.cmake
+    NAMESPACE ${PROJECT_NAME}::
+    EXPORT_LINK_INTERFACE_LIBRARIES
+)
 
+install( DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME} )

config/RAWTOACES.pc.in

@@ -2,10 +2,10 @@ prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@INSTALL_BIN_DIR@
 libdir=@INSTALL_LIB_DIR@
 includedir=@INSTALL_INCLUDE_DIR@
-RAWTOACES_includedir=@INSTALL_INCLUDE_DIR@/RAWTOACES
+RAWTOACES_includedir=@INSTALL_INCLUDE_DIR@/RawToAces
 
-Name: RAWTOACES
-Description: RAWTOACES raw image to ACES
+Name: RawToAces
+Description: RawToAces raw image to ACES
 Version: @RAWTOACES_VERSION@
-Libs: -L${libdir} -lCeres -lraw -lAcesContainer -lHalf
-Cflags: -I${RAWTOACES_includedir}
+Libs: -L${libdir} -lCeres -lraw -lAcesContainer -lHalf @IlmBase_LDFLAGS@
+Cflags: @IlmBase_CFLAGS@ -I${RAWTOACES_includedir}

config/RAWTOACESBuildTreeSettings.cmake.in

@@ -1,21 +1,11 @@
-# CMake config file for RAWTOACES
-# defines the following variables:
-#
-# RAWTOACES_INCLUDE_DIRS
-# RAWTOACES_LIBRARIES
-# RAWTOACES_EXECUTABLE
+@PACKAGE_INIT@
 
-# find paths
-get_filename_component( RAWTOACES_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
-if( EXISTS "${RAWTOACES_CMAKE_DIR}/CMakeCache.txt" )
-  # build tree...
-  include( "${RAWTOACES_CMAKE_DIR}/RAWTOACESBuildTreeSettings.cmake" )
-else()
-  set( RAWTOACES_INCLUDE_DIRS "${RAWTOACES_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@" )
-endif
+# Find dependencies required by RawToAces
+include ( CMakeFindDependencyMacro )
+find_dependency( Boost REQUIRED COMPONENTS headers system filesystem )
+find_dependency( Imath REQUIRED )
+find_dependency( Eigen3 REQUIRED )
+find_dependency( Ceres REQUIRED )
 
-# setup our library dependencies (i.e. Imath)
-include( "${RAWTOACES_CMAKE_DIR}/RAWTOACESLibraryDepends.cmake" )
-
-set( RAWTOACES_LIBRARIES RAWTOACES )
-set( RAWTOACES_EXECUTABLE rawtoaces )
+include( "${CMAKE_CURRENT_LIST_DIR}/@[email protected]" )
+check_required_components( "@PROJECT_NAME@" )