xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake fatal error if inih library is not found.

Browse Source
main
Kevin Backhouse 3 years ago
parent cccf265eab
commit ba258cb1ae
No known key found for this signature in database
GPG Key ID: 9DD01852EE40366E
3 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File

34
cmake/Findinih.cmake
Unescape Escape View File

@ -24,20 +24,22 @@ mark_as_advanced(inih_inireader_LIBRARY)
find_package_handle_standard_args(inih REQUIRED_VARS inih_LIBRARY inih_INCLUDE_DIR) find_package_handle_standard_args(inih REQUIRED_VARS inih_LIBRARY inih_INCLUDE_DIR)
if(inih_FOUND) if(NOT inih_FOUND)
set(inih_INCLUDE_DIRS "${inih_INCLUDE_DIR}") message(FATAL_ERROR "inih library not found")
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}")
endif() 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}")

10
cmake/findDependencies.cmake
Unescape Escape View File

@ -77,12 +77,10 @@ if( ICONV_FOUND )
endif() endif()
find_package(inih) find_package(inih)
if( inih_FOUND ) message ( "-- inih_INCLUDE_DIRS : " ${inih_INCLUDE_DIRS} )
message ( "-- inih_INCLUDE_DIRS : " ${inih_INCLUDE_DIRS} ) message ( "-- inih_LIBRARIES : " ${inih_LIBRARIES} )
message ( "-- inih_LIBRARIES : " ${inih_LIBRARIES} ) message ( "-- inih_inireader_INCLUDE_DIRS : " ${inih_inireader_INCLUDE_DIRS} )
message ( "-- inih_inireader_INCLUDE_DIRS : " ${inih_inireader_INCLUDE_DIRS} ) message ( "-- inih_inireader_LIBRARIES : " ${inih_inireader_LIBRARIES} )
message ( "-- inih_inireader_LIBRARIES : " ${inih_inireader_LIBRARIES} )
endif()
if( BUILD_WITH_CCACHE ) if( BUILD_WITH_CCACHE )
find_program(CCACHE_FOUND ccache) find_program(CCACHE_FOUND ccache)

10
src/CMakeLists.txt
Unescape Escape View File

@ -248,12 +248,10 @@ if( ICONV_FOUND )
target_link_libraries( exiv2lib PRIVATE Iconv::Iconv ) target_link_libraries( exiv2lib PRIVATE Iconv::Iconv )
endif() endif()
if( inih_FOUND ) target_link_libraries( exiv2lib_int PRIVATE inih::libinih )
target_link_libraries( exiv2lib_int PRIVATE inih::libinih ) target_link_libraries( exiv2lib_int PRIVATE inih::inireader )
target_link_libraries( exiv2lib_int PRIVATE inih::inireader ) target_link_libraries( exiv2lib PRIVATE inih::libinih )
target_link_libraries( exiv2lib PRIVATE inih::libinih ) target_link_libraries( exiv2lib PRIVATE inih::inireader )
target_link_libraries( exiv2lib PRIVATE inih::inireader )
endif()
write_basic_package_version_file(exiv2ConfigVersion.cmake COMPATIBILITY ExactVersion) write_basic_package_version_file(exiv2ConfigVersion.cmake COMPATIBILITY ExactVersion)

Write Preview
Loading…
Cancel
Save