fix installation scripts

CMakeLists.txt

@@ -16,7 +16,7 @@ if (TESTING)
   )
 endif ()
 
-project(schnorrkel-crust C CXX)
+project(schnorrkel_crust C CXX)
 
 include(FindPackageHandleStandardArgs)
 include(cmake/functions.cmake)

cmake/rust.cmake

@@ -9,18 +9,15 @@ else ()
   set(path_prefix "${CMAKE_BINARY_DIR}/debug")
 endif ()
 
-
 if (BUILD_SHARED_LIBS)
-  set(lib ${path_prefix}/${CMAKE_SHARED_LIBRARY_PREFIX}schnorrkel_crust${CMAKE_SHARED_LIBRARY_SUFFIX})
+  set(lib_name ${CMAKE_SHARED_LIBRARY_PREFIX}schnorrkel_crust${CMAKE_SHARED_LIBRARY_SUFFIX})
+  set(lib ${path_prefix}/${lib_name})
 else ()
-  set(lib ${path_prefix}/${CMAKE_STATIC_LIBRARY_PREFIX}schnorrkel_crust${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(lib_name ${CMAKE_STATIC_LIBRARY_PREFIX}schnorrkel_crust${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(lib ${path_prefix}/${lib_name})
 endif ()
 message(STATUS "[schnorrkel] library: ${lib}")
 
-
-set(include_path ${PROJECT_SOURCE_DIR}/include)
-set(schnorrkel_h_dir ${include_path}/schnorrkel)
-
 ### setup tasks
 add_custom_target(
     cargo_build
@@ -29,7 +26,32 @@ add_custom_target(
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 )
 
-add_library(schnorrkel_crust STATIC IMPORTED GLOBAL)
+include(GNUInstallDirs)
+
+add_library(schnorrkel_crust INTERFACE)
+
+target_include_directories(schnorrkel_crust
+  INTERFACE
+  "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
+  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+  )
+
+target_link_libraries(schnorrkel_crust
+  INTERFACE
+  "$<BUILD_INTERFACE:${lib}>"
+  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_LIBDIR}/${lib_name}>"
+  )
+
+add_dependencies(schnorrkel_crust
+  cargo_build
+  )
+
+install(TARGETS schnorrkel_crust
+  EXPORT ${PROJECT_NAME}Targets
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
 
 # if we build static lib
 if (NOT BUILD_SHARED_LIBS)
@@ -54,15 +76,6 @@ if (NOT BUILD_SHARED_LIBS)
   endif ()
 endif ()
 
-set_target_properties(schnorrkel_crust PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES ${include_path}
-    IMPORTED_LOCATION ${lib}
-    )
-add_dependencies(schnorrkel_crust cargo_build)
-
-file(MAKE_DIRECTORY ${schnorrkel_h_dir})
-
-
 ### add tests
 add_test(
     NAME cargo_test
@@ -71,18 +84,27 @@ add_test(
 )
 
 ### setup install task
-include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
 
-install(
-    DIRECTORY ${schnorrkel_h_dir}
-    TYPE INCLUDE
-)
-install(
-    FILES ${lib}
-    TYPE LIB
-)
+configure_package_config_file(
+  "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in"
+  "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+  INSTALL_DESTINATION
+  ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+  )
+
+install(EXPORT ${PROJECT_NAME}Targets
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+  FILE ${PROJECT_NAME}Targets.cmake
+  NAMESPACE ${PROJECT_NAME}::
+  EXPORT_LINK_INTERFACE_LIBRARIES
+  )
 
-install(
-    FILES ${PROJECT_SOURCE_DIR}/cmake/schnorrkel_crustConfig.cmake
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/schnorrkel_crust
+install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
 )
+
+install(FILES ${lib} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+install(DIRECTORY
+  ${PROJECT_SOURCE_DIR}/include/schnorrkel DESTINATION include)

cmake/schnorrkel_crustConfig.cmake.in

@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/schnorrkel_crustTargets.cmake")
+
+check_required_components(schnorrkel_crust)