third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: CURL does not need to be propagated

Browse Source
This commit is contained in:
Luis Díaz Más 2018-11-14 13:44:17 +01:00
parent 37538399d6
commit b208bcef7d
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/exiv2/http.hpp
View File

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

3
src/CMakeLists.txt
View File

@ -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