chore: Fixed thirdparty integration after refactor

GeniusVentures · Jul 9, 2024 · 669bd96 · 669bd96
1 parent 1428279
commit 669bd96
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,7 +65,8 @@ Testing
 # Autogenerated Tooling
 .build.Debug
 cmake-build-*/
+.cache
 
 # Testing residuals
 CRDT.Datastore.TEST.unit/
-CRDT.Datastore.TEST/
+CRDT.Datastore.TEST/
diff --git a/build/CommonBuildParameters.cmake b/build/CommonBuildParameters.cmake
@@ -15,6 +15,16 @@ set(GTest_INCLUDE_DIR "${_THIRDPARTY_BUILD_DIR}/GTest/include")
 find_package(GTest CONFIG REQUIRED)
 include_directories(${GTest_INCLUDE_DIR})
 
+# absl
+if(NOT DEFINED absl_DIR)
+    set(absl_DIR "${_THIRDPARTY_BUILD_DIR}/grpc/lib/cmake/absl")
+endif()
+
+# utf8_range
+if(NOT DEFINED utf8_range_DIR)
+    set(utf8_range_DIR "${_THIRDPARTY_BUILD_DIR}/grpc/lib/cmake/utf8_range")
+endif()
+
 # --------------------------------------------------------
 # Set config of protobuf project
 if(NOT DEFINED Protobuf_DIR)

diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
@@ -30,8 +30,8 @@ add_library(ed25519_types
 set_target_properties(ed25519_types PROPERTIES PUBLIC_HEADER "ed25519_types.hpp")
 target_link_libraries(ed25519_types
     blob
-    sgns::ed25519
-    )
+    iroha::ed25519
+)
 supergenius_install(ed25519_types)
 
 add_library(vrf_provider
@@ -75,9 +75,9 @@ target_link_libraries(secp256k1_provider PUBLIC
     PUBLIC OpenSSL::SSL
     blob
     buffer
-    secp256k1::secp256k1
+    libsecp256k1::secp256k1
     scale
-    )
+)
 supergenius_install(
     secp256k1_provider
 )

diff --git a/src/crypto/secp256k1/secp256k1_provider_impl.cpp b/src/crypto/secp256k1/secp256k1_provider_impl.cpp
@@ -1,6 +1,5 @@
 #include "crypto/secp256k1/secp256k1_provider_impl.hpp"
-
-#include <secp256k1_recovery.h>
+#include "secp256k1_recovery.h"
 
 namespace sgns::crypto {