diff options
| author | Elliott Hughes <enh@google.com> | 2018-10-30 11:28:38 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-10-30 11:28:38 -0700 |
| commit | b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee (patch) | |
| tree | 24facefd22d2ca56694f740049660701da90ee9a /lib/CMakeLists.txt | |
| parent | 8c49d19ccbe7df4ce7b150f5d92eaddcc7f369df (diff) | |
| download | external_curl-b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee.tar.gz external_curl-b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee.tar.bz2 external_curl-b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee.zip | |
Update to curl 7.61.1 - September 5 2018.
Bug: N/A
Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: Ic8598fc9d0bc029640ea3cbcecf4820d1de8f6ae
Diffstat (limited to 'lib/CMakeLists.txt')
| -rw-r--r-- | lib/CMakeLists.txt | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 6653d555..87cbe817 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,5 +1,13 @@ set(LIB_NAME libcurl) +if(BUILD_SHARED_LIBS) + set(CURL_STATICLIB NO) +else() + set(CURL_STATICLIB YES) +endif() + +# Use: +# * CURL_STATICLIB configure_file(curl_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h) @@ -59,28 +67,23 @@ if(USE_ARES) include_directories(${CARES_INCLUDE_DIR}) endif() -if(CURL_STATICLIB) - # Static lib - set(CURL_USER_DEFINED_DYNAMIC_OR_STATIC STATIC) -else() - # DLL / so dynamic lib - set(CURL_USER_DEFINED_DYNAMIC_OR_STATIC SHARED) -endif() - add_library( ${LIB_NAME} - ${CURL_USER_DEFINED_DYNAMIC_OR_STATIC} ${HHEADERS} ${CSOURCES} ) -if(MSVC AND CURL_STATICLIB) +if(MSVC AND NOT BUILD_SHARED_LIBS) set_target_properties(${LIB_NAME} PROPERTIES STATIC_LIBRARY_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) endif() +if(NOT BUILD_SHARED_LIBS) + set_target_properties(${LIB_NAME} PROPERTIES INTERFACE_COMPILE_DEFINITIONS CURL_STATICLIB) +endif() + target_link_libraries(${LIB_NAME} ${CURL_LIBS}) if(WIN32) - add_definitions( -D_USRDLL ) + add_definitions(-D_USRDLL) endif() set_target_properties(${LIB_NAME} PROPERTIES COMPILE_DEFINITIONS BUILDING_LIBCURL) @@ -95,14 +98,14 @@ set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") set_target_properties(${LIB_NAME} PROPERTIES IMPORT_PREFIX "") if(WIN32) - if(NOT CURL_STATICLIB) + if(BUILD_SHARED_LIBS) # Add "_imp" as a suffix before the extension to avoid conflicting with the statically linked "libcurl.lib" set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib") endif() endif() target_include_directories(${LIB_NAME} INTERFACE - $<INSTALL_INTERFACE:include>) + $<INSTALL_INTERFACE:include>) install(TARGETS ${LIB_NAME} EXPORT libcurl-target |