remove hack about deploying crypto3

NilFoundation · Sep 20, 2024 · 46c5ad9 · 46c5ad9
1 parent 3e32671
commit 46c5ad9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/crypto3/CMakeLists.txt b/crypto3/CMakeLists.txt
@@ -75,20 +75,10 @@ endif()
 configure_file(${CMAKE_CURRENT_LIST_DIR}/docs/doxygen/crypto3.doxyfile.in
         ${CMAKE_CURRENT_BINARY_DIR}/crypto3.doxyfile @ONLY)
 
-# Configure package file to be able to import crypto3 headers
-# TODO: remove it after resolving cyclical dependencies in crypto3 modules
-include(CMakePackageConfigHelpers)
-include(GNUInstallDirs)
 set(CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/crypto3)
 
-configure_package_config_file(
-        cmake/Config.cmake.in
-        crypto3Config.cmake
-        INSTALL_DESTINATION ${CONFIG_DIR}
-)
-
 install(
         FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/crypto3Config.cmake
+        cmake/crypto3Config.cmake
         DESTINATION ${CONFIG_DIR}
 )
diff --git a/crypto3/cmake/Config.cmake.in → crypto3/cmake/crypto3Config.cmake b/crypto3/cmake/Config.cmake.in → crypto3/cmake/crypto3Config.cmake
@@ -1,16 +1,13 @@
-@PACKAGE_INIT@
-
-include(CMakeFindDependencyMacro)
-find_dependency(Boost COMPONENTS REQUIRED
-                    container json filesystem log log_setup program_options thread system unit_test_framework)
-
 # Protect against multiple inclusion
 if (TARGET crypto3::all)
   return()
 endif()
 
+include(CMakeFindDependencyMacro)
+find_dependency(Boost COMPONENTS REQUIRED
+                    container json filesystem log log_setup program_options thread system unit_test_framework)
+
 add_library(crypto3::all INTERFACE IMPORTED)
 
 set_target_properties(crypto3::all PROPERTIES
-                        INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
                         INTERFACE_LINK_LIBRARIES ${Boost_LIBRARIES})