Skip to content

Commit 4c1580a

Browse files
curl.cmake included twice build error
1 parent d69e9f0 commit 4c1580a

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

ext/curl.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
include(ExternalProject)
22

3+
if(TARGET curl)
4+
set(CURL_FOUND TRUE)
5+
set(CURL_LIBRARIES curl)
6+
set(CURL_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ext/curl/include/)
7+
return()
8+
endif()
9+
310
if (NOT CURL_EXT_EXTRA_OPTIONS)
411
set(CURL_EXT_EXTRA_OPTIONS )
512
endif()
@@ -30,6 +37,7 @@ endif()
3037
ExternalProject_Add(
3138
curl_ext
3239
${CURL_EXT_PROPERTIES}
40+
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
3341
INSTALL_DIR ${CMAKE_BINARY_DIR}/ext/curl
3442
BUILD_BYPRODUCTS "${CMAKE_BINARY_DIR}/ext/curl/lib/libcurl.a"
3543
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext/curl" "-DBUILD_CURL_EXE=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DCURL_STATICLIB=ON" "-DCURL_DISABLE_LDAP=ON" "-DCURL_USE_LIBSSH2=OFF" "-DCURL_USE_OPENLDAP=OFF" "-DUSE_LIBIDN2=OFF" "-DCURL_USE_LIBPSL=OFF" "-DENABLE_WEBSOCKETS=ON" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_ASM_COMPILER=${CMAKE_ASM_COMPILER}" "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}" "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}" "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}" "-DCMAKE_LINK_FLAGS=${CMAKE_LINK_FLAGS}" "-DCMAKE_LIBRARY_ARCHITECTURE=${CMAKE_LIBRARY_ARCHITECTURE}" ${CURL_EXT_EXTRA_OPTIONS}

0 commit comments

Comments
 (0)