Hotfix.

Alvov1 · Sep 15, 2024 · 7ef7b4f · 7ef7b4f
2 parents 9e6099b + 7adb059
commit 7ef7b4f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 91 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -7,38 +7,43 @@ FetchContent_Declare(
         googletest
         URL https://github.com/google/googletest/archive/refs/heads/main.zip
 )
-
 FetchContent_MakeAvailable(googletest)
+FetchContent_Declare(
+        CryptoPPLib
+        GIT_REPOSITORY https://github.com/abdes/cryptopp-cmake.git
+        GIT_TAG        master
+)
+FetchContent_Populate(CryptoPPLib)
+
+find_package(PkgConfig)
+pkg_check_modules(GMP REQUIRED IMPORTED_TARGET gmp)
 
 enable_testing()
 
 file(GLOB Tests *.cpp)
-add_executable(AesiMultiprecision ${Tests} ../Aesi.h
-        speed_comparison/addition.cpp
-        speed_comparison/multiplication.cpp
-        speed_comparison/subtraction.cpp
-        speed_comparison/division.cpp
-        speed_comparison/powm.cpp
-        speed_comparison/gcd.cpp
-)
+add_executable(AesiMultiprecision ${Tests})
 add_subdirectory(arithmetic)
 add_subdirectory(operations)
 add_subdirectory(bitwise)
-add_subdirectory(number-theory)
-add_subdirectory(gpu)
 add_subdirectory(boolean)
-add_subdirectory(benchmarks)
 
-option(CRYPTOPP_CMP "Enable CryptoPP comparison" OFF)
-if (CRYPTOPP_CMP)
-    add_subdirectory(cryptopp-cmake-master)
-    set(CryptoppLibraryCall cryptopp)
-endif()
+add_compile_definitions(CRYPTOPP_USE_STD_SHOWBASE)
+add_compile_definitions(AESI_CRYPTOPP_INTEGRATION)
+add_compile_definitions(AESI_GMP_INTEGRATION)
+add_subdirectory(${cryptopplib_SOURCE_DIR} ${cryptopplib_BINARY_DIR})
+
+if (PREPROCESSOR_UNSAFE)
+    add_definitions(-DAESI_UNSAFE=1)
+endif (PREPROCESSOR_UNSAFE)
+
+if (PREPROCESSOR_PRE_CPP_20)
+    add_definitions(-DPRE_CPP_20=1)
+endif (PREPROCESSOR_PRE_CPP_20)
 
-include_directories(${SQLite3_INCLUDE_DIRS})
-target_link_libraries(AesiMultiprecision GTest::gtest_main ${SQLite3_LIBRARIES} ${CryptoppLibraryCall})
+target_link_libraries(AesiMultiprecision PUBLIC GTest::gtest_main cryptopp PkgConfig::GMP)
+target_include_directories(AesiMultiprecision PUBLIC PkgConfig::GMP)
 
 include(GoogleTest)
-gtest_discover_tests(AesiMultiprecision)
+gtest_discover_tests(AesiMultiprecision XML_OUTPUT_DIR ${CMAKE_BINARY_DIR})
 
 
diff --git a/test/test-generation/main.cpp b/test/test-generation/main.cpp