diff --git a/.gitmodules b/.gitmodules index e1dee0ef..f34e3be5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "3rdparty/tinydir"] path = 3rdparty/tinydir url = https://github.com/cxong/tinydir.git +[submodule "3rdparty/BLAKE2"] + path = 3rdparty/BLAKE2 + url = https://github.com/BLAKE2/BLAKE2.git diff --git a/3rdparty/BLAKE2 b/3rdparty/BLAKE2 new file mode 160000 index 00000000..b52178a3 --- /dev/null +++ b/3rdparty/BLAKE2 @@ -0,0 +1 @@ +Subproject commit b52178a376ca85a8ffe50492263c2a5bc0fa4f46 diff --git a/CMakeLists.txt b/CMakeLists.txt index e74dd5a7..2d4d3212 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.10) set(BUILD_NUMBER CACHE STRING "The number of the current build.") diff --git a/src/Cedar/CMakeLists.txt b/src/Cedar/CMakeLists.txt index 4eefc034..dd283681 100644 --- a/src/Cedar/CMakeLists.txt +++ b/src/Cedar/CMakeLists.txt @@ -19,6 +19,13 @@ set_target_properties(cedar RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}" ) +cmake_host_system_information(RESULT HAS_SSE2 QUERY HAS_SSE2) + +set(BLAKE2_SRC_PATH $,${TOP_DIRECTORY}/3rdparty/BLAKE2/sse,${TOP_DIRECTORY}/3rdparty/BLAKE2/ref>) + +target_include_directories(cedar PUBLIC ${BLAKE2_SRC_PATH}) +target_sources(cedar PRIVATE "${BLAKE2_SRC_PATH}/blake2s.c") + if(WIN32) set_target_properties(cedar PROPERTIES