Scott E. Graves
8dd46b8ad8
Some checks reported errors
BlockStorage/repertory/pipeline/head Something is wrong with the build of this commit
## v2.0.2-rc ### BREAKING CHANGES * Refactored `config.json` - will need to verify configuration settings prior to mounting ### Issues * \#12 \[Unit Test\] Complete all providers unit tests * \#14 \[Unit Test\] SQLite mini-ORM unit tests and cleanup * \#16 Add support for bucket name in Sia provider * \#17 Update to common c++ build system * A single 64-bit Linux Jenkins server is used to build all Linux and Windows versions * All dependency sources are now included * MSVC is no longer supported * MSYS2 is required for building Windows binaries on Windows * OS X support is temporarily disabled * \#19 \[bug\] Rename file is broken for files that are existing * \#23 \[bug\] Incorrect file size displayed while upload is pending * \#24 RocksDB implementations should be transactional * \#25 Writes should block when maximum cache size is reached * \#26 Complete ring buffer and direct download support ### Changes from v2.0.1-rc * Ability to choose between RocksDB and SQLite databases * Added direct reads and implemented download fallback * Corrected file times on S3 and Sia providers * Corrected handling of `chown()` and `chmod()` * Fixed erroneous download of chunks after resize Reviewed-on: #27
49 lines
1.3 KiB
CMake
49 lines
1.3 KiB
CMake
if(PROJECT_ENABLE_LIBSODIUM)
|
|
if(PROJECT_BUILD)
|
|
pkg_check_modules(SODIUM libsodium>=${LIBSODIUM_VERSION} REQUIRED)
|
|
|
|
add_definitions(-DPROJECT_ENABLE_LIBSODIUM)
|
|
|
|
include_directories(BEFORE SYSTEM ${SODIUM_INCLUDE_DIRS})
|
|
|
|
if(PROJECT_IS_MINGW_UNIX)
|
|
if(PROJECT_STATIC_LINK)
|
|
link_libraries(/mingw64/lib/libsodium.a)
|
|
else()
|
|
link_libraries(/mingw64/lib/libsodium.dll.a)
|
|
endif()
|
|
else()
|
|
link_libraries(${SODIUM_LIBRARIES})
|
|
endif()
|
|
elseif(NOT PROJECT_IS_MINGW)
|
|
if(PROJECT_IS_MINGW)
|
|
set(LIBSODIUM_TYPE mingw64)
|
|
else()
|
|
set(LIBSODIUM_TYPE linux)
|
|
endif()
|
|
|
|
if(PROJECT_BUILD_SHARED_LIBS)
|
|
set(LIBSODIUM_ENABLE_SHARED yes)
|
|
else()
|
|
set(LIBSODIUM_ENABLE_SHARED no)
|
|
endif()
|
|
|
|
ExternalProject_Add(libsodium_project
|
|
PREFIX external
|
|
URL ${PROJECT_3RD_PARTY_DIR}/libsodium-${LIBSODIUM_VERSION}.tar.gz
|
|
URL_HASH SHA256=${LIBSODIUM_HASH}
|
|
BUILD_IN_SOURCE 1
|
|
LIST_SEPARATOR |
|
|
CONFIGURE_COMMAND ${PROJECT_3RD_PARTY_DIR}/libsodium_configure.sh
|
|
${LIBSODIUM_TYPE}
|
|
${PROJECT_MARCH}
|
|
${PROJECT_EXTERNAL_BUILD_ROOT}
|
|
${LIBSODIUM_ENABLE_SHARED}
|
|
BUILD_COMMAND make -j1
|
|
INSTALL_COMMAND make install
|
|
)
|
|
|
|
list(APPEND PROJECT_DEPENDENCIES libsodium_project)
|
|
endif()
|
|
endif()
|