cmake fixes

osu-crypto · Jun 12, 2024 · 6490267 · 6490267
1 parent b1d1851
commit 6490267
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git 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
@@ -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")
-
+
+set(CMAKE_PREFIX_PATH ${PUSHED_CMAKE_PREFIX_PATH})
diff --git a/cryptoTools b/cryptoTools
diff --git 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
+7 −1		cmake/Config.cmake.in
+1 −0		cmake/cryptoToolsConfig.cmake
+1 −1		thirdparty/getCoproto.cmake