find deps fix

ladnir · Aug 23, 2024 · 3179392 · 3179392
1 parent bb2b61e
commit 3179392
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -10,6 +10,7 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
         "FETCH_AUTO": true,
+        "ENABLE_BOOST": true,
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
       },
       "vendor": {
@@ -30,6 +31,7 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "ENABLE_RELIC": false,
+        "ENABLE_SODIUM": true,
         "ENABLE_CIRCUITS": false,
         "FETCH_AUTO": true,
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"

diff --git a/cmake/cryptoToolsConfig.cmake b/cmake/cryptoToolsConfig.cmake
@@ -19,6 +19,9 @@ if(NOT DEFINED OC_THIRDPARTY_HINT)
     set(OC_THIRDPARTY_HINT "${CMAKE_CURRENT_LIST_DIR}/../out/install/${OC_CONFIG}")
 endif()
 
+
 include("${CMAKE_CURRENT_LIST_DIR}/cryptoToolsFindBuildDir.cmake")
+set(CMAKE_PREFIX_PATH "${CRYPTOTOOLS_BUILD_DIR}/macoro;${CMAKE_PREFIX_PATH}")
+set(CMAKE_PREFIX_PATH "${CRYPTOTOOLS_BUILD_DIR}/coproto;${CMAKE_PREFIX_PATH}")
 include("${CRYPTOTOOLS_BUILD_DIR}/cryptoToolsConfig.cmake")
 
diff --git a/cmake/cryptoToolsDepHelper.cmake b/cmake/cryptoToolsDepHelper.cmake
@@ -47,6 +47,8 @@ endif()
 set(PUSHED_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
 set(CMAKE_PREFIX_PATH "${OC_THIRDPARTY_HINT};${CMAKE_PREFIX_PATH}")
 
+#message("OC_THIRDPARTY_HINT=${OC_THIRDPARTY_HINT}")
+#message("CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
 
 ## Relic
 ###########################################################################

diff --git a/thirdparty/getSodium.cmake b/thirdparty/getSodium.cmake
@@ -1,7 +1,7 @@
 
 
-set(GIT_REPOSITORY      https://github.com/ladnir/libsodium.git)
-set(GIT_TAG             "884b4d3ab22e905fad69e5f8add35a50be82c2ba" )
+set(GIT_REPOSITORY      https://github.com/osu-crypto/libsodium.git)
+set(GIT_TAG             "778c9cf491fdeeef362512fb964db0943732f275" )
 
 set(CLONE_DIR "${OC_THIRDPARTY_CLONE_DIR}/libsodium")
 set(BUILD_DIR "${CLONE_DIR}/build/${OC_CONFIG}")