misc fixes

marty1885 · Jun 26, 2023 · 9e9a3c1 · 9e9a3c1
1 parent 2375275
commit 9e9a3c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,5 +28,7 @@ configure_package_config_file(
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnunetppConfig.cmake
     DESTINATION lib/cmake/gnunetpp)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGNUnet.cmake
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGNUnet.cmake
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Findidn.cmake
     DESTINATION lib/cmake/gnunetpp)
diff --git a/gnunetpp/CMakeLists.txt b/gnunetpp/CMakeLists.txt
@@ -21,7 +21,8 @@ target_compile_definitions(gnunetpp PUBLIC -DENABLE_NLS)
 install(
     DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION include
-    FILES_MATCHING PATTERN "*.hpp")
+    FILES_MATCHING PATTERN "*.hpp"
+    PATTERN "pch.hpp" EXCLUDE)
 install(
     TARGETS gnunetpp
     LIBRARY DESTINATION lib

diff --git a/gnunetppConfig.cmake.in b/gnunetppConfig.cmake.in
@@ -19,19 +19,10 @@ include(CMakeFindDependencyMacro)
 add_library(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE IMPORTED)
 set_target_properties(@PROJECT_NAME@::@PROJECT_NAME@ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_INCLUDEDIR}")
 
+# Find dependencies
+find_package(GNUnet REQUIRED)
+
 target_link_libraries(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE
     @PROJECT_NAME@
-    gnunetnamestore
-    gnunetgnsrecord
-    gnunetidentity
-    gnunetcore
-    gnunetutil
-    gnunetfs
-    gnunetdht
-    gnunetnse
-    gnunetcadet
-    gnunetpeerinfo
-    gnunetdatastore
-    gnunetgns
-    gnunetmessenger
+    GNUnet::GNUnet
 )