Merge remote-tracking branch 'origin/topic/timw/require-cmake-3.15'

timwoj · timwoj · commit 9302f2895117 · 2025-01-29T09:04:07.000-07:00
* origin/topic/timw/require-cmake-3.15:
  Require CMake 3.15, inline with other Zeek projects
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+1.2-4 | 2025-01-29 09:03:57 -0700
+
+  * Require CMake 3.15, inline with other Zeek projects (Tim Wojtulewicz, Corelight)
+
 1.2-2 | 2025-01-21 09:08:38 -0700
 
   * Enforce using the right bash.exe on Windows (Tim Wojtulewicz)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR)
 project(btest)
 
 # Install scripts
diff --git a/README b/README
@@ -2,7 +2,7 @@
 ..
 .. Version number is filled in automatically.
 
-.. |version| replace:: 1.2-2
+.. |version| replace:: 1.2-4
 
 ==================================================
 BTest - A Generic Driver for Powerful System Tests
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2-2
+1.2-4
diff --git a/btest b/btest
@@ -56,7 +56,7 @@ else:
     import multiprocessing.managers as mp_managers
     import multiprocessing.sharedctypes as mp_sharedctypes
 
-VERSION = "1.2-2"  # Automatically filled in.
+VERSION = "1.2-4"  # Automatically filled in.
 
 Name = "btest"
 Config = None
diff --git a/setup.py b/setup.py
@@ -5,6 +5,6 @@
 py_modules = ["btest-sphinx"]
 
 setup(
-    version="1.2.dev2",  # Filled in automatically.
+    version="1.2.dev4",  # Filled in automatically.
     py_modules=py_modules,
 )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)`
	`1`	`+cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR)`
`2`	`2`	`project(btest)`
`3`	`3`
`4`	`4`	`# Install scripts`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`	`py_modules = ["btest-sphinx"]`
`6`	`6`
`7`	`7`	`setup(`
`8`		`- version="1.2.dev2", # Filled in automatically.`
	`8`	`+ version="1.2.dev4", # Filled in automatically.`
`9`	`9`	`py_modules=py_modules,`
`10`	`10`	`)`