From 0c6df96a81648f543c3c568f3f136c41202270d4 Mon Sep 17 00:00:00 2001 From: leleliu008 Date: Fri, 9 Aug 2024 21:40:29 +0800 Subject: [PATCH] libINIReader depends on libinih, the order is important when these libraries are static libraries (cherry picked from commit 75c12fb54dd08b6fdec076d983b34a945438a1d6) # Conflicts: # src/CMakeLists.txt --- src/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9e1e875809..8b14c3a8d1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -257,11 +257,19 @@ if( Iconv_FOUND AND Iconv_LIBRARIES ) list(APPEND libs_private_list "iconv") endif() +<<<<<<< HEAD if( EXIV2_ENABLE_INIH ) 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 ) +======= +if(EXIV2_ENABLE_INIH) + target_link_libraries(exiv2lib_int PRIVATE inih::inireader) + target_link_libraries(exiv2lib_int PRIVATE inih::libinih) + target_link_libraries(exiv2lib PRIVATE inih::inireader) + target_link_libraries(exiv2lib PRIVATE inih::libinih) +>>>>>>> 75c12fb54 (libINIReader depends on libinih, the order is important when these libraries are static libraries) list(APPEND requires_private_list "INIReader") endif()