From 4fa2bc70085686f8b31c546ec2a81da61efd2b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Thu, 20 Dec 2018 22:57:12 +0100 Subject: [PATCH] Propagate CURL linkage when it is enabled --- conanfile.py | 2 +- samples/conntest.cpp | 4 ++++ src/CMakeLists.txt | 5 ++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index d811961c..8dd6b73a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -16,7 +16,7 @@ class Exiv2Conan(ConanFile): ) def configure(self): - self.options['libcurl'].shared = False + self.options['libcurl'].shared = True self.options['libcurl'].with_openssl = True self.options['gtest'].shared = True diff --git a/samples/conntest.cpp b/samples/conntest.cpp index 22fce2c3..c7a8ee80 100644 --- a/samples/conntest.cpp +++ b/samples/conntest.cpp @@ -4,6 +4,10 @@ #include +#ifdef EXV_USE_CURL + #include +#endif + #include #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 32137c0f..0ca74eea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -174,12 +174,11 @@ if (EXIV2_ENABLE_WEBREADY) if( EXIV2_ENABLE_CURL ) target_include_directories(exiv2lib SYSTEM PUBLIC ${CURL_INCLUDE_DIR} ) + target_link_libraries(exiv2lib PUBLIC ${CURL_LIBRARIES}) if (USING_CONAN) - target_link_libraries(exiv2lib PUBLIC ${CONAN_LIBS_LIBCURL} ${CONAN_LIBS_OPENSSL}) + target_link_libraries(exiv2lib PUBLIC ${CONAN_LIBS_OPENSSL}) target_compile_definitions(exiv2lib PUBLIC ${CONAN_COMPILE_DEFINITIONS_LIBCURL}) target_link_libraries(exiv2lib PUBLIC ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) - else() - target_link_libraries(exiv2lib PRIVATE ${CURL_LIBRARIES}) endif() endif()