diff options
| author | Elliott Hughes <enh@google.com> | 2018-12-12 14:22:48 -0800 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2018-12-12 17:16:20 -0800 |
| commit | a93fb051349a5907b547a8f41c23a4b45bc82c0e (patch) | |
| tree | 15ffc0718b7d289dc407c0d3851234b7f71286b0 /lib/CMakeLists.txt | |
| parent | 849332cb73701636b19b97f3d82e8e9fa0d51a30 (diff) | |
| download | external_curl-a93fb051349a5907b547a8f41c23a4b45bc82c0e.tar.gz external_curl-a93fb051349a5907b547a8f41c23a4b45bc82c0e.tar.bz2 external_curl-a93fb051349a5907b547a8f41c23a4b45bc82c0e.zip | |
Update to curl 7.62.0 - October 31 2018.
Bug: N/A
Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: If5e3aa0ced1b9d13cc4f2217f381ab9df8d16dcc
Diffstat (limited to 'lib/CMakeLists.txt')
| -rw-r--r-- | lib/CMakeLists.txt | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 87cbe817..eca9a8af 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -105,23 +105,17 @@ if(WIN32) endif() target_include_directories(${LIB_NAME} INTERFACE - $<INSTALL_INTERFACE:include>) + $<INSTALL_INTERFACE:include> + $<BUILD_INTERFACE:${CURL_SOURCE_DIR}/include>) install(TARGETS ${LIB_NAME} - EXPORT libcurl-target - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin + EXPORT ${TARGETS_EXPORT_NAME} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) export(TARGETS ${LIB_NAME} APPEND FILE ${PROJECT_BINARY_DIR}/libcurl-target.cmake NAMESPACE CURL:: ) - -install(EXPORT libcurl-target - FILE libcurl-target.cmake - NAMESPACE CURL:: - DESTINATION ${CURL_INSTALL_CMAKE_DIR} -) - |