kagome-crates fixup

Author: iceseer

src/crypto/ed25519.hpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <schnorrkel_crust.h>
+#include <schnorrkel/schnorrkel.h>
 #include <qtils/bytes.hpp>
 
 namespace jam::crypto::ed25519 {

test-vectors/disputes/CMakeLists.txt

@@ -4,12 +4,12 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-find_package(schnorrkel_crust CONFIG REQUIRED)
+find_package(qdrvm-crates CONFIG REQUIRED)
 
 add_test_vector(disputes tiny full)
 
 add_test_vector_libraries(disputes
     PkgConfig::libb2
-    schnorrkel_crust::schnorrkel_crust
+    schnorrkel::schnorrkel
 )
 

vcpkg-overlay/kagome-crates/portfile.cmake

@@ -1,29 +1,28 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO qdrvm/kagome-crates
-  REF c4a2c5ea9c7b2fda8623066591593a35dc47b927
-  SHA512 1c5ae38aa64ac4dca2c37f950785bfdc588127cf2d2a2386744dee911983c7d3944c3d441d709c7eaaa39e41f6786a2b8f11d86b315805c7d4f443533a8e3fac
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO qdrvm/kagome-crates
+    REF c4a2c5ea9c7b2fda8623066591593a35dc47b927
+    SHA512 1c5ae38aa64ac4dca2c37f950785bfdc588127cf2d2a2386744dee911983c7d3944c3d441d709c7eaaa39e41f6786a2b8f11d86b315805c7d4f443533a8e3fac
+    HEAD_REF main
 )
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DQDRVM_BIND_CRATES=schnorrkel;bandersnatch_vrfs
 )
-vcpkg_cmake_install()
 
-# 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"
-)
+vcpkg_cmake_build()
 
-# 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"
-)
+vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Use vcpkg_cmake_config_fixup to properly move config files
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/qdrvm-crates PACKAGE_NAME qdrvm-crates)
+
+# Remove any remaining empty lib/cmake/qdrvm-crates directory  
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")