From 168420dba8ee7e14709e00df9d22da8b4bcf5847 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Tue, 29 Oct 2019 12:07:20 -0400 Subject: [PATCH] finishing touches --- .gitlab-ci.yml | 2 +- CMakeLists.txt | 1 + readme.md | 5 +++-- readme_es.md | 5 +++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 702de5a1e..f317d6359 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ build:linux: - linux stage: build before_script: - - apt-get update && apt-get install -y build-essential cmake git libcap-dev bsdmainutils ninja-build curl git ca-certificates ccache libuv1-dev + - apt-get update && apt-get install -y build-essential cmake git libcap-dev bsdmainutils ninja-build curl git ca-certificates ccache libuv1-dev libsodium-dev script: - make STATIC_LINK=OFF artifacts: diff --git a/CMakeLists.txt b/CMakeLists.txt index 78e12c148..bfbfcfa9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,7 @@ include(cmake/unix.cmake) include(cmake/win32.cmake) if(WIN32) + set(VENDOR_LIBSODIUM ON) set(CMAKE_CXX_STANDARD 17) else() set(CMAKE_CXX_STANDARD 14) diff --git a/readme.md b/readme.md index b52508782..999dd63ac 100644 --- a/readme.md +++ b/readme.md @@ -70,12 +70,13 @@ Build requirements: * C++ 17 capable C++ compiler * gcovr (if generating test coverage with gcc) * libuv >= 1.27.0 +* libsodium ### Linux build: - $ sudo apt install build-essential cmake git libcap-dev curl libuv1-dev + $ sudo apt install build-essential cmake git libcap-dev curl libuv1-dev libsodium-dev $ git clone https://github.com/loki-project/loki-network $ cd loki-network $ make @@ -169,7 +170,7 @@ install (root): build: - $ pkg install cmake git curl libuv-1.27.0 + $ pkg install cmake git curl libuv-1.27.0 libsodium $ git clone https://github.com/loki-project/loki-network $ cd loki-network $ gmake -j8 diff --git a/readme_es.md b/readme_es.md index 639f906ff..741f640db 100644 --- a/readme_es.md +++ b/readme_es.md @@ -70,12 +70,13 @@ Requerimientos de compilaciĆ³n: * Compilador C++ que pueda usar C++ 17 * gcovr (para generar la covertura de prueba en gcc) * libuv >= 1.27.0 +* libsodium ### Linux compilando: - $ sudo apt install build-essential cmake git libcap-dev curl libuv1-dev + $ sudo apt install build-essential cmake git libcap-dev curl libuv1-dev libsodium-dev $ git clone https://github.com/loki-project/loki-network $ cd loki-network $ make @@ -169,7 +170,7 @@ instalando (root): compilando: - $ pkg install cmake git curl libuv-1.27.0 + $ pkg install cmake git curl libuv-1.27.0 libsodium $ git clone https://github.com/loki-project/loki-network $ cd loki-network $ gmake -j8