Skip to content

Commit bfd06eb

Browse files
fix building with older curl
1 parent 4c1580a commit bfd06eb

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

ext/curl.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ if (DEFINED CMAKE_TOOLCHAIN_FILE)
2727
list(APPEND CURL_EXT_EXTRA_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
2828
endif()
2929

30+
# -DCMAKE_INSTALL_LIBDIR=lib is required to find libcurl.a on fedora, default is lib64
3031
if(OWN_CURL_SOURCE_DIR)
3132
set(CURL_EXT_PROPERTIES SOURCE_DIR ${OWN_CURL_SOURCE_DIR})
3233
else()
@@ -37,7 +38,6 @@ endif()
3738
ExternalProject_Add(
3839
curl_ext
3940
${CURL_EXT_PROPERTIES}
40-
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
4141
INSTALL_DIR ${CMAKE_BINARY_DIR}/ext/curl
4242
BUILD_BYPRODUCTS "${CMAKE_BINARY_DIR}/ext/curl/lib/libcurl.a"
4343
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)