build fixup

Author: iceseer

CMakeLists.txt

@@ -68,11 +68,9 @@ pkg_check_modules(libb2 REQUIRED IMPORTED_TARGET GLOBAL libb2)
 find_package(Boost CONFIG REQUIRED COMPONENTS algorithm outcome program_options)
 find_package(fmt CONFIG REQUIRED)
 find_package(yaml-cpp CONFIG REQUIRED)
-find_package(kagome-crates CONFIG REQUIRED)
-find_package(jam_crust CONFIG REQUIRED)
+find_package(qdrvm-crates CONFIG REQUIRED)
 find_package(scale CONFIG REQUIRED)
 find_package(soralog CONFIG REQUIRED)
-find_package(schnorrkel_crust CONFIG REQUIRED)
 find_package(Boost.DI CONFIG REQUIRED)
 find_package(qtils CONFIG REQUIRED)
 find_package(prometheus-cpp CONFIG REQUIRED)

src/crypto/bandersnatch.hpp

@@ -9,7 +9,7 @@
 #include <memory>
 #include <optional>
 
-#include <jam_crust.h>
+#include <bandersnatch_vrfs.h>
 #include <qtils/bytes.hpp>
 
 namespace jam::crypto::bandersnatch {

test-vectors/disputes/CMakeLists.txt

@@ -4,10 +4,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+find_package(schnorrkel_crust CONFIG REQUIRED)
+
 add_test_vector(disputes tiny full)
 
 add_test_vector_libraries(disputes
-    jam_crust::jam_crust
     PkgConfig::libb2
     schnorrkel_crust::schnorrkel_crust
 )

test-vectors/safrole/CMakeLists.txt

@@ -7,6 +7,5 @@
 add_test_vector(safrole tiny full)
 
 add_test_vector_libraries(safrole
-    jam_crust::jam_crust
     PkgConfig::libb2
 )

vcpkg-overlay/kagome-crates/portfile.cmake

@@ -5,10 +5,25 @@ vcpkg_from_github(
   REF 9011440d56d51bb33e7c4c6a47e85314178ce87f
   SHA512 f0b1b0e1ed6e20d149d5639e14c231a46f3cdaaa6bfa320bfd64e88c4ed0496fa4246c3135e0032647c05c2aaac02804b565fbeae34b1625771114c8b263920d
 )
-vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" 
-  OPTIONS
-    -DQDRVM_BIND_CRATES=schnorrkel;bandersnatch_vrfs
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DQDRVM_BIND_CRATES=schnorrkel;bandersnatch_vrfs
 )
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME "kagome-crates")
+
+# Rename the share directory to match the package name qdrvm-crates
+file(RENAME 
+    "${CURRENT_PACKAGES_DIR}/share/kagome-crates" 
+    "${CURRENT_PACKAGES_DIR}/share/qdrvm-crates"
+)
+
+# The config file is actually created with this name
+file(RENAME 
+    "${CURRENT_PACKAGES_DIR}/share/qdrvm-crates/kagome-crates-config.cmake" 
+    "${CURRENT_PACKAGES_DIR}/share/qdrvm-crates/qdrvm-cratesConfig.cmake"
+)
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")