Use static version of libcurl.

Note that this will simplify the packaging/deployment
v0.27.3
Luis Díaz Más 7 years ago
parent f47b0546ac
commit 18ded9ccf3

@ -26,7 +26,7 @@ endif( )
if( EXIV2_ENABLE_WEBREADY )
set( ENABLE_WEBREADY 1 )
if( EXIV2_ENABLE_CURL )
find_package( CURL REQUIRED)
find_package(CURL REQUIRED)
endif()
if( EXIV2_ENABLE_SSH )

@ -14,8 +14,8 @@ class Exiv2Conan(ConanFile):
)
def configure(self):
if not os_info.is_macos:
self.options['libcurl'].shared = True
self.options['libcurl'].shared = False
self.options['libcurl'].with_openssl = True
self.options['gtest'].shared = True
def requirements(self):

@ -239,10 +239,12 @@ 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_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})
endif()
endif()

Loading…
Cancel
Save