Additional fixes to clean up use of LibRaw and install configuration

Author: mikaelsundell

CMakeLists.txt

@@ -85,23 +85,23 @@ add_executable( rawtoaces
     main.cpp
 )
 
-target_include_directories( rawtoaces
-    PUBLIC
+target_include_directories(rawtoaces
+    PRIVATE
         ${AcesContainer_INCLUDE_DIRS}
 )
 
-target_link_libraries ( rawtoaces
-    PUBLIC
+target_link_libraries(rawtoaces
+    PRIVATE
         ${RAWTOACESLIB}
-    INTERFACE
-        Boost::headers
+        Boost::filesystem
+        Boost::system
 )
 
 if ( LIBRAW_CONFIG_FOUND )
     target_link_libraries ( rawtoaces PUBLIC libraw::raw )
 else ()
-    target_link_directories(rawtoaces PUBLIC ${libraw_LIBRARY_DIRS} )
-    target_link_libraries(rawtoaces PUBLIC ${libraw_LIBRARIES} ${libraw_LDFLAGS_OTHER} )
+    target_link_directories(rawtoaces PUBLIC ${LibRaw_LIBRARY_DIRS} )
+    target_link_libraries(rawtoaces PUBLIC ${LibRaw_LIBRARIES} ${LibRaw_LDFLAGS_OTHER} )
 endif ()
 
 enable_testing()
@@ -131,15 +131,8 @@ configure_package_config_file(
     INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
 )
 
-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/modules/FindLibRaw.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/modules
 )
 
 install (

cmake/modules/FindlibRaw.cmake

@@ -0,0 +1,75 @@
+#
+# FindLibRaw.cmake - Locate LibRaw
+#
+# This will define:
+#   LibRaw_FOUND - True if LibRaw was found
+#   LibRaw_INCLUDE_DIRS - Include directories for LibRaw
+#   LibRaw_LIBRARIES - Libraries to link against
+#   LibRaw_VERSION - Detected version
+# And create imported target:
+#   LibRaw::LibRaw
+#
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_LibRaw QUIET libraw)
+endif()
+
+# Brew special handling for macOS
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND PC_LibRaw_FOUND AND "${PC_LibRaw_INCLUDEDIR}" MATCHES ".*/Cellar/.*")
+    set(_LibRaw_HINT_INCLUDE /usr/local/include)
+    set(_LibRaw_HINT_LIB /usr/local/lib)
+endif()
+
+# Hints from pkg-config
+if(PC_LibRaw_FOUND)
+    set(LibRaw_CFLAGS ${PC_LibRaw_CFLAGS_OTHER})
+    set(LibRaw_LIBRARY_DIRS ${PC_LibRaw_LIBRARY_DIRS})
+    set(LibRaw_LDFLAGS ${PC_LibRaw_LDFLAGS_OTHER})
+    if("${_LibRaw_HINT_INCLUDE}" STREQUAL "")
+        set(_LibRaw_HINT_INCLUDE ${PC_LibRaw_INCLUDEDIR} ${PC_LibRaw_INCLUDE_DIRS})
+        set(_LibRaw_HINT_LIB ${PC_LibRaw_LIBDIR} ${PC_LibRaw_LIBRARY_DIRS})
+    endif()
+endif()
+
+# Locate header
+find_path(LibRaw_INCLUDE_DIR libraw/libraw.h
+    HINTS ${_LibRaw_HINT_INCLUDE}
+)
+# Detect version
+if(LibRaw_INCLUDE_DIR AND EXISTS "${LibRaw_INCLUDE_DIR}/libraw_version.h")
+    file(STRINGS "${LibRaw_INCLUDE_DIR}/libraw_version.h" libraw_version_str
+         REGEX "^#define[\t ]+LIBRAW_VERSION_STR[\t ]+\".*")
+    string(REGEX REPLACE "^#define[\t ]+LIBRAW_VERSION_STR[\t ]+\"([^ \\n]*)\".*"
+           "\\1" LibRaw_VERSION "${libraw_version_str}")
+endif()
+
+# Locate library
+find_library(LibRaw_LIBRARY
+    NAMES raw libraw
+    HINTS ${_LibRaw_HINT_LIB}
+)
+
+# Handle required variables
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LibRaw
+    REQUIRED_VARS LibRaw_LIBRARY LibRaw_INCLUDE_DIR
+    VERSION_VAR LibRaw_VERSION
+)
+
+# Set include and libs
+if(LibRaw_FOUND)
+    set(LibRaw_INCLUDE_DIRS ${LibRaw_INCLUDE_DIR})
+    set(LibRaw_LIBRARIES ${LibRaw_LIBRARY})
+
+    # Create imported target
+    if(NOT TARGET LibRaw::LibRaw)
+        add_library(LibRaw::LibRaw UNKNOWN IMPORTED)
+        set_target_properties(LibRaw::LibRaw PROPERTIES
+            IMPORTED_LOCATION "${LibRaw_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${LibRaw_INCLUDE_DIRS}"
+        )
+    endif()
+endif()
+
+mark_as_advanced(LibRaw_INCLUDE_DIR LibRaw_LIBRARY)

cmake/modules/Findlibraw.cmake

@@ -1,11 +1,17 @@
 @PACKAGE_INIT@
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
+
 # Find dependencies required by RawToAces
 include ( CMakeFindDependencyMacro )
-find_dependency( Boost REQUIRED COMPONENTS headers system filesystem )
-find_dependency( Imath REQUIRED )
+find_dependency( Boost REQUIRED COMPONENTS filesystem system )
 find_dependency( Eigen3 REQUIRED )
 find_dependency( Ceres REQUIRED )
 
+find_package(LibRaw CONFIG QUIET)
+if(NOT LibRaw_FOUND)
+    find_package(LibRaw MODULE REQUIRED)
+endif()
+
 include( "${CMAKE_CURRENT_LIST_DIR}/@[email protected]" )
 check_required_components( "@PROJECT_NAME@" )

config/RAWTOACESConfig.cmake.in

@@ -19,12 +19,17 @@ else ()
     find_package ( Ceres CONFIG REQUIRED )
 endif ()
 
-find_package (libraw CONFIG QUIET )
+find_package (LibRaw CONFIG QUIET )
 
-if (libraw_FOUND )
-    message("STATUS LibRaw config found")
+if ( LibRaw_FOUND )
+    message( "STATUS LibRaw config found" )
     set ( LIBRAW_CONFIG_FOUND TRUE )
 else ()
-    message("WARNING LibRaw config not found, trying to find a module.")
-    find_package(libraw MODULE REQUIRED)
+    message( "WARNING LibRaw config not found, trying to find a module.")
+    find_package( LibRaw MODULE REQUIRED )
+    if (LibRaw_FOUND)
+        message(STATUS "LibRaw found via module fallback")
+    else()
+        message(FATAL_ERROR "LibRaw could not be found even with module fallback")
+    endif()
 endif ()

configure.cmake

@@ -3,22 +3,48 @@ include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 add_library( ${RAWTOACESIDTLIB} ${DO_SHARED}
     rta.cpp
-
-    # Make the headers visible in IDEs. This should not affect the builds.
     ../../include/rawtoaces/define.h
     ../../include/rawtoaces/mathOps.h
     ../../include/rawtoaces/rta.h
 )
 
+target_include_directories(${RAWTOACESIDTLIB}
+    PUBLIC
+        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+)
+
 target_link_libraries(
     ${RAWTOACESIDTLIB}
     PUBLIC
-        Boost::boost
-        Boost::system
+	    Eigen3::Eigen
+)
+
+target_link_libraries(${RAWTOACESIDTLIB}
+    PRIVATE
+        Eigen3::Eigen
         Boost::filesystem
+        Boost::system
+)
+
+if (TARGET libraw::raw)
+    target_link_libraries(${RAWTOACESIDTLIB} PUBLIC libraw::raw)
+else()
+    if (libraw_INCLUDE_DIRS)
+        target_include_directories(${RAWTOACESIDTLIB} PUBLIC ${LibRaw_INCLUDE_DIRS})
+    endif()
+    if (libraw_LIBRARY_DIRS)
+        target_link_directories(${RAWTOACESIDTLIB} PRIVATE ${LibRaw_LIBRARY_DIRS})
+    endif()
+    if (libraw_LIBRARIES)
+        target_link_libraries(${RAWTOACESIDTLIB} PUBLIC ${LibRaw_LIBRARIES} ${LibRaw_LDFLAGS_OTHER})
+    endif()
+endif()
+
+target_link_libraries(${RAWTOACESIDTLIB}
+    PRIVATE
         Imath::Imath
         Imath::ImathConfig
-	Eigen3::Eigen
 )
 
 if ( ${Ceres_VERSION_MAJOR} GREATER 1 )
@@ -28,18 +54,22 @@ else ()
     target_link_libraries(${RAWTOACESIDTLIB} PUBLIC ${CERES_LIBRARIES})
 endif ()
 
-
-set_target_properties( ${RAWTOACESIDTLIB} PROPERTIES
-    SOVERSION ${RAWTOACES_MAJOR_VERSION}.${RAWTOACES_MINOR_VERSION}.${RAWTOACES_PATCH_VERSION}
-    VERSION ${RAWTOACES_VERSION}
-)
-
-install(FILES
+set(RAWTOACESIDT_HEADERS
     ${PROJECT_SOURCE_DIR}/include/rawtoaces/define.h
     ${PROJECT_SOURCE_DIR}/include/rawtoaces/mathOps.h
     ${PROJECT_SOURCE_DIR}/include/rawtoaces/rta.h
+)
 
- 	DESTINATION include/rawtoaces
+set_target_properties(${RAWTOACESIDTLIB} PROPERTIES
+    SOVERSION ${RAWTOACES_MAJOR_VERSION}.${RAWTOACES_MINOR_VERSION}.${RAWTOACES_PATCH_VERSION}
+    VERSION ${RAWTOACES_VERSION}
+    PUBLIC_HEADER "${RAWTOACESIDT_HEADERS}"
 )
 
-install( TARGETS ${RAWTOACESIDTLIB} DESTINATION lib )
+install(TARGETS ${RAWTOACESIDTLIB}
+    EXPORT ${PROJECT_NAME}Targets
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rawtoaces
+)