Fix libcurl linkage on Windows

(cherry picked from commit abaffbc) # Conflicts: # samples/CMakeLists.txt # src/CMakeLists.txt
Exiv2 · Jun 10, 2024 · 531e0d6 · 531e0d6
1 parent c4758ed
commit 531e0d6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -103,13 +103,22 @@ endif()
 
 # ******************************************************************************
 # connection test application
+<<<<<<< HEAD
 if (EXIV2_ENABLE_WEBREADY)
     add_executable(conntest conntest.cpp)
     list(APPEND APPLICATIONS conntest)
     if( EXIV2_ENABLE_CURL )
         target_include_directories(conntest SYSTEM PRIVATE ${CURL_INCLUDE_DIR} )
         target_link_libraries(conntest PRIVATE ${CURL_LIBRARIES})
     endif()
+=======
+if(EXIV2_ENABLE_WEBREADY)
+  add_executable(conntest conntest.cpp)
+  list(APPEND APPLICATIONS conntest)
+  if(EXIV2_ENABLE_CURL)
+    target_link_libraries(conntest PRIVATE CURL::libcurl)
+  endif()
+>>>>>>> abaffbc7c (Fix libcurl linkage on Windows)
 endif()
 
 # ******************************************************************************

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -203,12 +203,20 @@ target_include_directories(exiv2lib_int PUBLIC
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/exiv2>
 )
 
+<<<<<<< HEAD
 if (EXIV2_ENABLE_WEBREADY)
     if( EXIV2_ENABLE_CURL )
         target_include_directories(exiv2lib SYSTEM PRIVATE ${CURL_INCLUDE_DIR} )
         target_link_libraries(exiv2lib PRIVATE ${CURL_LIBRARIES})
         list(APPEND requires_private_list "libcurl")
     endif()
+=======
+if(EXIV2_ENABLE_WEBREADY)
+  if(EXIV2_ENABLE_CURL)
+    target_link_libraries(exiv2lib PRIVATE CURL::libcurl)
+    list(APPEND requires_private_list "libcurl")
+  endif()
+>>>>>>> abaffbc7c (Fix libcurl linkage on Windows)
 endif()
 
 if (WIN32)