static build fixes in cmake stuff

I hate cmake so much.

.drone.jsonnet

@@ -235,7 +235,7 @@ local mac_builder(name, build_type='Release', werror=true, cmake_extra='', extra
 
     // Static build (on bionic) which gets uploaded to builds.lokinet.dev:
     debian_pipeline("Static (bionic amd64)", "ubuntu:bionic", deps='g++-8 python3-dev', lto=true,
-                    cmake_extra='-DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 ' +
+                    cmake_extra='-DBUILD_STATIC_DEPS=ON -DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 ' +
                         '-DDOWNLOAD_SODIUM=ON -DDOWNLOAD_CURL=ON -DDOWNLOAD_UV=ON -DWITH_SYSTEMD=OFF',
                     extra_cmds=[
                         '../contrib/ci/drone-check-static-libs.sh',

CMakeLists.txt

@@ -29,6 +29,9 @@ if(RELEASE_MOTTO)
 endif()
 
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+
+
 # Core options
 option(USE_AVX2 "enable avx2 code" OFF)
 option(USE_NETNS "enable networking namespace support. Linux only" OFF)
@@ -94,8 +97,6 @@ endif()
 include(cmake/solaris.cmake)
 include(cmake/win32.cmake)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-
 # No in-source building
 include(MacroEnsureOutOfSourceBuild)
 macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out-of-source build.  Create a build directory and run 'cmake ${CMAKE_SOURCE_DIR} [options]'.")

crypto/CMakeLists.txt

@@ -70,11 +70,11 @@ endif()
 option(DOWNLOAD_SODIUM "Allow libsodium to be downloaded and built locally if not found on the system" OFF)
 
 # Allow -DDOWNLOAD_SODIUM=FORCE to download without even checking for a local libsodium
-if(NOT DOWNLOAD_SODIUM STREQUAL "FORCE")
+if((NOT BUILD_STATIC_DEPS) AND (NOT DOWNLOAD_SODIUM STREQUAL "FORCE"))
   find_package(Sodium 1.0.18)
 endif()
 
-if(sodium_FOUND)
+if(sodium_FOUND OR BUILD_STATIC_DEPS)
   target_link_libraries(lokinet-cryptography PUBLIC sodium)
 elseif(DOWNLOAD_SODIUM)
   message(STATUS "Sodium >= 1.0.18 not found, but DOWNLOAD_SODIUM specified, so downloading it")