BlockStorage/repertory
1
0
Fork 0
Code Issues 7 Pull Requests Releases 6 Wiki Activity

cmake build refactor
All checks were successful
BlockStorage/repertory_osx/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Scott E. Graves 2023-10-29 20:21:37 -05:00
parent a67979ec40
commit c156ae704b
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/curl.cmake
View File

@ -31,14 +31,20 @@ set(CURL_CMAKE_ARGS
-DUSE_LIBIDN2=OFF -DUSE_LIBIDN2=OFF
) )
if (MINGW AND CMAKE_TOOLCHAIN_FILE) if (CMAKE_TOOLCHAIN_FILE)
set(CURL_CMAKE_ARGS set(CURL_CMAKE_ARGS
${CURL_CMAKE_ARGS} ${CURL_CMAKE_ARGS}
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
)
endif()
if (MINGW)
set(CURL_CMAKE_ARGS
${CURL_CMAKE_ARGS}
-DCURL_USE_OPENSSL=OFF -DCURL_USE_OPENSSL=OFF
-DUSE_WIN32_CRYPTO=ON -DUSE_WIN32_CRYPTO=ON
) )
elseif(NOT MINGW) else()
set(CURL_CMAKE_ARGS set(CURL_CMAKE_ARGS
${CURL_CMAKE_ARGS} ${CURL_CMAKE_ARGS}
-DCURL_USE_OPENSSL=ON -DCURL_USE_OPENSSL=ON

15
cmake/openssl.cmake
View File

@ -28,16 +28,9 @@ ExternalProject_Add(openssl_project
INSTALL_COMMAND make install INSTALL_COMMAND make install
) )
if (MACOS) set(OPENSSL_LIBRARIES
set(OPENSSL_LIBRARIES ${EXTERNAL_BUILD_ROOT}/lib/libssl.a
${EXTERNAL_BUILD_ROOT}/lib/libssl.a ${EXTERNAL_BUILD_ROOT}/lib/libcrypto.a
${EXTERNAL_BUILD_ROOT}/lib/libcrypto.a )
)
else()
set(OPENSSL_LIBRARIES
libssl.a
libcrypto.a
)
endif()
add_dependencies(openssl_project zlib_project) add_dependencies(openssl_project zlib_project)