CMake: CURL does not need to be propagated

v0.27.3
Luis Díaz Más 7 years ago
parent 37538399d6
commit b208bcef7d

@ -19,8 +19,4 @@ namespace Exiv2 {
EXIV2API int http(Exiv2::Dictionary& request,Exiv2::Dictionary& response,std::string& errors); EXIV2API int http(Exiv2::Dictionary& request,Exiv2::Dictionary& response,std::string& errors);
} }
#ifdef EXV_USE_CURL
#include <curl/curl.h>
#endif
#endif #endif

@ -185,7 +185,7 @@ if (EXIV2_ENABLE_WEBREADY)
target_compile_definitions(exiv2lib PUBLIC ${CONAN_COMPILE_DEFINITIONS_LIBCURL}) target_compile_definitions(exiv2lib PUBLIC ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
target_link_libraries(exiv2lib PUBLIC ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) target_link_libraries(exiv2lib PUBLIC ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
else() else()
target_link_libraries(exiv2lib PUBLIC ${CURL_LIBRARIES}) target_link_libraries(exiv2lib PRIVATE ${CURL_LIBRARIES})
endif() endif()
endif() endif()
@ -202,7 +202,6 @@ if ( MSVC )
source_group("Header Files" FILES ${LIBEXIV2_HDR} ) source_group("Header Files" FILES ${LIBEXIV2_HDR} )
source_group("Header Files" FILES ${LIBCURL_HDR} ) source_group("Header Files" FILES ${LIBCURL_HDR} )
source_group("Header Files" FILES ${SSH_HDR} ) source_group("Header Files" FILES ${SSH_HDR} )
target_link_libraries( exiv2lib PRIVATE ${CURL_LIBRARIES} ${SSH_LIBRARIES})
else() else()
if ( UNIX AND NOT FREEBSD ) if ( UNIX AND NOT FREEBSD )
target_link_libraries( exiv2lib PRIVATE ${CMAKE_DL_LIBS}) # -ldl = dynamic loader used by src/version.cpp target_link_libraries( exiv2lib PRIVATE ${CMAKE_DL_LIBS}) # -ldl = dynamic loader used by src/version.cpp

Loading…
Cancel
Save