From 6490267b557bae009aaf4e28f4d2fbaa5f2387d3 Mon Sep 17 00:00:00 2001
From: Peter Rindal <peterrindal@gmail.com>
Date: Wed, 12 Jun 2024 11:34:19 -0700
Subject: [PATCH] cmake fixes

---
 cmake/Config.cmake.in                  |  5 ++++-
 cmake/libOTeConfig.cmake               | 10 +++++++++-
 cryptoTools                            |  2 +-
 libOTe_Tests/cmakeTests/CMakeLists.txt |  6 +++---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
index ea394130..24772e94 100644
--- a/cmake/Config.cmake.in
+++ b/cmake/Config.cmake.in
@@ -1,6 +1,9 @@
 @PACKAGE_INIT@
 
-message("found libOTe: ${CMAKE_CURRENT_LIST_FILE}")
+
+if(NOT LIBOTE_FIND_QUIETLY)
+    message("libOTeConfig.cmake: ${CMAKE_CURRENT_LIST_DIR}")
+endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/buildOptions.cmake")
 find_package(cryptoTools REQUIRED HINTS "${CMAKE_CURRENT_LIST_DIR}/.." ${CMAKE_CURRENT_LIST_DIR})
diff --git a/cmake/libOTeConfig.cmake b/cmake/libOTeConfig.cmake
index d8729508..31d66e9d 100644
--- a/cmake/libOTeConfig.cmake
+++ b/cmake/libOTeConfig.cmake
@@ -1,6 +1,14 @@
 # these are just pass through config file for the ones that are placed in the build directory.
 
 
+
+#used to find coproto, macoro
+set(PUSHED_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
+set(CMAKE_PREFIX_PATH "${COPROTO_BUILD_DIR}/macoro;${CMAKE_PREFIX_PATH}")
+set(CMAKE_PREFIX_PATH "${COPROTO_BUILD_DIR}/coproto;${CMAKE_PREFIX_PATH}")
+#message("\n\nhere ${CMAKE_CURRENT_LIST_FILE}\nCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}\n\n")
+
 include("${CMAKE_CURRENT_LIST_DIR}/libOTePreamble.cmake")
 include("${LIBOTE_BUILD_DIR}/libOTeConfig.cmake")
- 
\ No newline at end of file
+ 
+set(CMAKE_PREFIX_PATH ${PUSHED_CMAKE_PREFIX_PATH})
\ No newline at end of file
diff --git a/cryptoTools b/cryptoTools
index 135743e1..1cb95d6a 160000
--- a/cryptoTools
+++ b/cryptoTools
@@ -1 +1 @@
-Subproject commit 135743e100ad0a2a719f7886437e572911123da8
+Subproject commit 1cb95d6a0734ec459225f5d14967ef58872ef3c6
diff --git a/libOTe_Tests/cmakeTests/CMakeLists.txt b/libOTe_Tests/cmakeTests/CMakeLists.txt
index 1ecf2fde..455ad24b 100644
--- a/libOTe_Tests/cmakeTests/CMakeLists.txt
+++ b/libOTe_Tests/cmakeTests/CMakeLists.txt
@@ -16,10 +16,10 @@ find_package(libOTe REQUIRED HINTS ${LIBOTE_HINT}
 		#no_sse
 		#no_avx
 		#bitpolymul
-		simplestot
-		mrr
+		#simplestot
+		#mrr
 		#mrr_twist
-		mr
+		#mr
 		#mr_kyber
 		kos
 		iknp