Merge remote-tracking branch 'origin/issue/gh-399'

* origin/issue/gh-399:
  Properly install config.hh header (again)

CHANGES

@@ -1,3 +1,14 @@
+2.8.0-dev.61 | 2024-05-06 14:26:27 -0700
+
+  * Properly install config.hh header (again) (Dominik Charousset, Corelight)
+
+  * Disable tools when building Broker as sub-project (Dominik Charousset, Corelight)
+
+    Projects that build Broker only as a dependency (like Zeek) have no use
+    for the benchmark tools. Hence, those targets should be excluded from
+    the build to avoid building superfluous binaries but also since they
+    might cause build issues in some scenarios.
+
 2.8.0-dev.56 | 2024-03-19 15:54:34 -0700
 
   * Fix update-changes config due to version.hh moving (Tim Wojtulewicz, Corelight)

CMakeLists.txt

@@ -263,8 +263,6 @@ install(DIRECTORY libbroker/broker
         PATTERN "libbroker/broker/internal" EXCLUDE
         PATTERN "*.test.hh" EXCLUDE)
 
-# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION include/broker)
-
 if (NOT BROKER_EXTERNAL_SQLITE_TARGET)
   include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
   set_source_files_properties(3rdparty/sqlite3.c PROPERTIES COMPILE_FLAGS

VERSION

@@ -1 +1 @@
-2.8.0-dev.56
+2.8.0-dev.61

libbroker/CMakeLists.txt

@@ -1,6 +1,9 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/broker/config.hh.in
                ${CMAKE_CURRENT_BINARY_DIR}/broker/config.hh)
 
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/broker/config.hh
+        DESTINATION include/broker)
+
 set(BROKER_SRC
   # src/detail/core_recorder.cc
   # src/detail/generator_file_reader.cc