Merge pull request #411

zeek · May 31, 2024 · 023502a · 023502a
2 parents 47aa9f2 + ffd2b28
commit 023502a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,10 @@
+2.8.0-dev.78 | 2024-05-31 09:09:10 +0200
+
+  * Remove workaround for unsupported CMake versions (Dominik Charousset, Corelight)
+
+    Since we have bumped the minimum CMake version to 3.15, we no longer
+    need to worry about older CMake version.
+
 2.8.0-dev.76 | 2024-05-31 09:08:22 +0200
 
   * Add missing dependency to serialization benchmark (Dominik Charousset, Corelight)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -213,12 +213,7 @@ endfunction()
 #       version is the bundled version!
 if (CAF_ROOT)
   message(STATUS "Using system CAF version ${CAF_VERSION}")
-  # TODO: drop < 3.12 compatibility check when raising the minimum CMake version
-  if (CMAKE_VERSION VERSION_LESS 3.12)
-    find_package(CAF REQUIRED COMPONENTS test io core net PATHS "${CAF_ROOT}")
-  else()
-    find_package(CAF REQUIRED COMPONENTS test io core net)
-  endif()
+  find_package(CAF REQUIRED COMPONENTS test io core net)
   list(APPEND LINK_LIBS CAF::core CAF::io CAF::net)
   set(BROKER_USE_EXTERNAL_CAF ON)
 else ()

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.8.0-dev.76
+2.8.0-dev.78