Merge branch 'master' into simplify-build-system-and-add-python-as-dependency

dcwhite · web-flow · commit 70f2c35e1e05 · 2022-05-04T14:00:44.000-06:00
diff --git a/Superbuild/CMakeLists.txt b/Superbuild/CMakeLists.txt
@@ -24,8 +24,7 @@
 #  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 #  DEALINGS IN THE SOFTWARE.
 
-cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
-#cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 #cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 if(POLICY CMP0053)
    cmake_policy(SET CMP0053 OLD)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -26,8 +26,7 @@
 #  DEALINGS IN THE SOFTWARE.
 #
 
-cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
-#cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 #cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 if(POLICY CMP0020)
   cmake_policy(SET CMP0020 NEW)

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@`
`26`	`26`	`# DEALINGS IN THE SOFTWARE.`
`27`	`27`	`#`
`28`	`28`
`29`		`-cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)`
`30`		`-#cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)`
	`29`	`+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)`
`31`	`30`	`#cmake_minimum_required(VERSION 3.0 FATAL_ERROR)`
`32`	`31`	`if(POLICY CMP0020)`
`33`	`32`	`cmake_policy(SET CMP0020 NEW)`