From ab0bc0488ec922b47960375853284e69016b3335 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Fri, 18 Mar 2022 14:43:23 +0100 Subject: [PATCH] Removed libsodium as it's not used in compilation --- .gitmodules | 3 --- CMakeLists.txt | 5 ----- external/src/libsodium | 1 - 3 files changed, 9 deletions(-) delete mode 160000 external/src/libsodium diff --git a/.gitmodules b/.gitmodules index fbd4f02..cd09725 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "external/src/cppzmq"] path = external/src/cppzmq url = https://github.com/SChernykh/cppzmq -[submodule "external/src/libsodium"] - path = external/src/libsodium - url = https://github.com/SChernykh/libsodium [submodule "external/src/libuv"] path = external/src/libuv url = https://github.com/SChernykh/libuv diff --git a/CMakeLists.txt b/CMakeLists.txt index af5b3bf..edf0128 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,6 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang find_library(ZMQ_LIBRARY NAMES zmq libzmq.a) find_library(UV_LIBRARY_DEBUG NAMES uv libuv.a) find_library(UV_LIBRARY NAMES uv libuv.a) - find_library(SODIUM_LIBRARY sodium) endif() find_library(PGM_LIBRARY pgm) @@ -125,10 +124,6 @@ if (NORM_LIBRARY) set(LIBS ${LIBS} ${NORM_LIBRARY}) endif() -if (SODIUM_LIBRARY) - set(LIBS ${LIBS} ${SODIUM_LIBRARY}) -endif() - add_definitions(/DZMQ_STATIC) add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES}) diff --git a/external/src/libsodium b/external/src/libsodium deleted file mode 160000 index dce3bca..0000000 --- a/external/src/libsodium +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dce3bca3bad8553fb942603f6afb8289fb418459