From b208bcef7d81b612a4a9ee025ec04bf56222d5d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Wed, 14 Nov 2018 13:44:17 +0100 Subject: [PATCH] CMake: CURL does not need to be propagated --- include/exiv2/http.hpp | 4 ---- src/CMakeLists.txt | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/exiv2/http.hpp b/include/exiv2/http.hpp index eab54f5e..f6793049 100644 --- a/include/exiv2/http.hpp +++ b/include/exiv2/http.hpp @@ -19,8 +19,4 @@ namespace Exiv2 { EXIV2API int http(Exiv2::Dictionary& request,Exiv2::Dictionary& response,std::string& errors); } -#ifdef EXV_USE_CURL -#include -#endif - #endif diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e9fc47aa..3cd3657f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -185,7 +185,7 @@ if (EXIV2_ENABLE_WEBREADY) target_compile_definitions(exiv2lib PUBLIC ${CONAN_COMPILE_DEFINITIONS_LIBCURL}) target_link_libraries(exiv2lib PUBLIC ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) else() - target_link_libraries(exiv2lib PUBLIC ${CURL_LIBRARIES}) + target_link_libraries(exiv2lib PRIVATE ${CURL_LIBRARIES}) endif() endif() @@ -202,7 +202,6 @@ if ( MSVC ) source_group("Header Files" FILES ${LIBEXIV2_HDR} ) source_group("Header Files" FILES ${LIBCURL_HDR} ) source_group("Header Files" FILES ${SSH_HDR} ) - target_link_libraries( exiv2lib PRIVATE ${CURL_LIBRARIES} ${SSH_LIBRARIES}) else() if ( UNIX AND NOT FREEBSD ) target_link_libraries( exiv2lib PRIVATE ${CMAKE_DL_LIBS}) # -ldl = dynamic loader used by src/version.cpp