diff --git a/cmake/Findinih.cmake b/cmake/Findinih.cmake index 0913d32a..22fc2470 100644 --- a/cmake/Findinih.cmake +++ b/cmake/Findinih.cmake @@ -24,20 +24,22 @@ mark_as_advanced(inih_inireader_LIBRARY) find_package_handle_standard_args(inih REQUIRED_VARS inih_LIBRARY inih_INCLUDE_DIR) -if(inih_FOUND) - set(inih_INCLUDE_DIRS "${inih_INCLUDE_DIR}") - set(inih_LIBRARIES "${inih_LIBRARY}") - if(NOT TARGET inih::libinih) - add_library(inih::libinih INTERFACE IMPORTED) - endif() - set_property(TARGET inih::libinih PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${inih_INCLUDE_DIRS}") - set_property(TARGET inih::libinih PROPERTY INTERFACE_LINK_LIBRARIES "${inih_LIBRARIES}") - - set(inih_inireader_INCLUDE_DIRS "${inih_inireader_INCLUDE_DIR}") - set(inih_inireader_LIBRARIES "${inih_inireader_LIBRARY}") - if(NOT TARGET inih::inireader) - add_library(inih::inireader INTERFACE IMPORTED) - endif() - set_property(TARGET inih::inireader PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${inih_inireader_INCLUDE_DIRS}") - set_property(TARGET inih::inireader PROPERTY INTERFACE_LINK_LIBRARIES "${inih_inireader_LIBRARIES}") +if(NOT inih_FOUND) + message(FATAL_ERROR "inih library not found") endif() + +set(inih_INCLUDE_DIRS "${inih_INCLUDE_DIR}") +set(inih_LIBRARIES "${inih_LIBRARY}") +if(NOT TARGET inih::libinih) + add_library(inih::libinih INTERFACE IMPORTED) +endif() +set_property(TARGET inih::libinih PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${inih_INCLUDE_DIRS}") +set_property(TARGET inih::libinih PROPERTY INTERFACE_LINK_LIBRARIES "${inih_LIBRARIES}") + +set(inih_inireader_INCLUDE_DIRS "${inih_inireader_INCLUDE_DIR}") +set(inih_inireader_LIBRARIES "${inih_inireader_LIBRARY}") +if(NOT TARGET inih::inireader) + add_library(inih::inireader INTERFACE IMPORTED) +endif() +set_property(TARGET inih::inireader PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${inih_inireader_INCLUDE_DIRS}") +set_property(TARGET inih::inireader PROPERTY INTERFACE_LINK_LIBRARIES "${inih_inireader_LIBRARIES}") diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake index d3f3f761..1e2cff1d 100644 --- a/cmake/findDependencies.cmake +++ b/cmake/findDependencies.cmake @@ -77,12 +77,10 @@ if( ICONV_FOUND ) endif() find_package(inih) -if( inih_FOUND ) - message ( "-- inih_INCLUDE_DIRS : " ${inih_INCLUDE_DIRS} ) - message ( "-- inih_LIBRARIES : " ${inih_LIBRARIES} ) - message ( "-- inih_inireader_INCLUDE_DIRS : " ${inih_inireader_INCLUDE_DIRS} ) - message ( "-- inih_inireader_LIBRARIES : " ${inih_inireader_LIBRARIES} ) -endif() +message ( "-- inih_INCLUDE_DIRS : " ${inih_INCLUDE_DIRS} ) +message ( "-- inih_LIBRARIES : " ${inih_LIBRARIES} ) +message ( "-- inih_inireader_INCLUDE_DIRS : " ${inih_inireader_INCLUDE_DIRS} ) +message ( "-- inih_inireader_LIBRARIES : " ${inih_inireader_LIBRARIES} ) if( BUILD_WITH_CCACHE ) find_program(CCACHE_FOUND ccache) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9c75e9c8..45599953 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -248,12 +248,10 @@ if( ICONV_FOUND ) target_link_libraries( exiv2lib PRIVATE Iconv::Iconv ) endif() -if( inih_FOUND ) - target_link_libraries( exiv2lib_int PRIVATE inih::libinih ) - target_link_libraries( exiv2lib_int PRIVATE inih::inireader ) - target_link_libraries( exiv2lib PRIVATE inih::libinih ) - target_link_libraries( exiv2lib PRIVATE inih::inireader ) -endif() +target_link_libraries( exiv2lib_int PRIVATE inih::libinih ) +target_link_libraries( exiv2lib_int PRIVATE inih::inireader ) +target_link_libraries( exiv2lib PRIVATE inih::libinih ) +target_link_libraries( exiv2lib PRIVATE inih::inireader ) write_basic_package_version_file(exiv2ConfigVersion.cmake COMPATIBILITY ExactVersion)