diff options
| -rw-r--r-- | indra/cmake/CURL.cmake | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index 7f50975ea8..9e9bbce47b 100644 --- a/indra/cmake/CURL.cmake +++ b/indra/cmake/CURL.cmake @@ -13,7 +13,7 @@ use_prebuilt_binary(curl) if (DARWIN) execute_process( COMMAND lipo -archs libcurl.a - WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release + WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE} OUTPUT_VARIABLE curl_archs OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -23,7 +23,7 @@ use_prebuilt_binary(curl) libcurl.a -thin ${CMAKE_OSX_ARCHITECTURES} -output libcurl.a - WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release + WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE} ) endif (NOT ${curl_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES}) endif (DARWIN) @@ -46,23 +46,9 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA endif () file( COPY - ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/curl.h - ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/curlbuild.h - ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/curlrules.h - ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/curlver.h - ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/easy.h - ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/mprintf.h - ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/multi.h - ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/stdcheaders.h - ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/system.h - ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/typecheck-gcc.h - DESTINATION ${LIBS_PREBUILT_DIR}/include/curl - ) - file( - COPY - ${LIBS_PREBUILT_DIR}/lib/release/libcrypto.a - ${LIBS_PREBUILT_DIR}/lib/release/libssl.a - DESTINATION ${LIBS_PREBUILT_DIR}/lib + ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.a + ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.a + DESTINATION ${ARCH_PREBUILT_DIRS} ) if (CMAKE_SYSTEM_NAME MATCHES FreeBSD) message("We need to temporarily have OpenSSL3 header directory and libraries renamed just until the libcurl building process with OpenSSL1.1 now is finished.") @@ -74,18 +60,18 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA endif (CMAKE_SYSTEM_NAME MATCHES FreeBSD) set(ENV{CFLAGS} "-std=c90") execute_process( - COMMAND ./configure --disable-alt-svc --disable-dict --disable-doh --disable-file --disable-gopher --disable-headers-api --disable-hsts --disable-imap --disable-ldap --disable-ldaps --disable-libcurl-option --disable-manual --disable-mqtt --disable-ntlm --disable-ntlm-wb --disable-pop3 --disable-rtsp --disable-shared --disable-smb --disable-smtp --disable-sspi --disable-telnet --disable-tftp --disable-tls-srp --disable-unix-sockets --disable-verbose --disable-versioned-symbols --enable-threaded-resolver --with-ssl=${LIBS_PREBUILT_DIR} --without-libidn2 --without-libpsl --without-libssh2 + COMMAND ./configure --disable-alt-svc --disable-dict --disable-doh --disable-file --disable-gopher --disable-headers-api --disable-hsts --disable-imap --disable-ldap --disable-ldaps --disable-libcurl-option --disable-manual --disable-mqtt --disable-ntlm --disable-ntlm-wb --disable-pop3 --disable-rtsp --disable-shared --disable-smb --disable-smtp --disable-sspi --disable-telnet --disable-tftp --disable-tls-srp --disable-unix-sockets --disable-verbose --disable-versioned-symbols --enable-threaded-resolver --with-ssl=${LIBS_PREBUILT_DIR} --without-libidn2 --without-libpsl --without-libssh2 --prefix=${LIBS_PREBUILT_DIR} --libdir=${ARCH_PREBUILT_DIRS_RELEASE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl ) execute_process( COMMAND make -j${MAKE_JOBS} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl - RESULT_VARIABLE curl_installed ) unset(ENV{CFLAGS}) - file( - COPY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/lib/.libs/libcurl.a - DESTINATION ${LIBS_PREBUILT_DIR}/lib/release + execute_process( + COMMAND make install + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl + RESULT_VARIABLE curl_installed ) if (CMAKE_SYSTEM_NAME MATCHES FreeBSD) execute_process(COMMAND sudo mv /usr/include/openssl3 /usr/include/openssl) @@ -96,8 +82,8 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA message("OpenSSL3 header directory and library names have been restored.") endif (CMAKE_SYSTEM_NAME MATCHES FreeBSD) file(REMOVE - ${LIBS_PREBUILT_DIR}/lib/libcrypto.a - ${LIBS_PREBUILT_DIR}/lib/libssl.a + ${ARCH_PREBUILT_DIRS}/libcrypto.a + ${ARCH_PREBUILT_DIRS}/libssl.a ) file(WRITE ${PREBUILD_TRACKING_DIR}/curl_installed "${curl_installed}") endif (LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR DARWIN OR NOT USESYSTEMLIBS) |