Merge pull request Slicer#94 from Slicer/FixConfigBuilds

jcfr · web-flow · commit 92269e5a6538 · 2018-03-21T18:37:40.000-04:00
COMP: Fix language feature introspection for SEM
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,28 @@
-project(SlicerExecutionModel)
-
 #-----------------------------------------------------------------------------
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 3.5)
+foreach(p
+  ## Only policies introduced after the cmake_minimum_required
+  ## version need to explicitly be set to NEW.
+#Policies Introduced by CMake 3.11
+CMP0072  # FindOpenGL prefers GLVND by default when available.
+#Policies Introduced by CMake 3.10
+CMP0071  # Let AUTOMOC and AUTOUIC process GENERATED files.
+CMP0070  # Define file(GENERATE) behavior for relative paths.
+#Policies Introduced by CMake 3.9
+CMP0069  # INTERPROCEDURAL_OPTIMIZATION is enforced when enabled.
+CMP0068  # RPATH settings on macOS do not affect install_name.
+#Policies Introduced by CMake 3.8
+CMP0067  # Honor language standard in try_compile() source-file signature.
+#Policies Introduced by CMake 3.7
+CMP0066  # Honor per-config flags in try_compile() source-file signature.
+  )
+  if(POLICY ${p})
+    cmake_policy(SET ${p} NEW)
+  endif()
+endforeach()
+
+project(SlicerExecutionModel CXX)
+
 #-----------------------------------------------------------------------------
 
 include(CMakeDependentOption)
diff --git a/GenerateCLP/CMakeLists.txt b/GenerateCLP/CMakeLists.txt
@@ -1,8 +1,7 @@
-project(GenerateCLP)
-
 #-----------------------------------------------------------------------------
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 3.5)
 #-----------------------------------------------------------------------------
+project(GenerateCLP)
 
 #-----------------------------------------------------------------------------
 # Set a default build type if none was specified
diff --git a/GenerateCLP/Testing/CLPExample1/CMakeLists.txt b/GenerateCLP/Testing/CLPExample1/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 3.5)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/GenerateCLPTestMacros.cmake)
 
diff --git a/GenerateCLP/Testing/CLPTestMultiple/CMakeLists.txt b/GenerateCLP/Testing/CLPTestMultiple/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 3.5)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/GenerateCLPTestMacros.cmake)
 
diff --git a/GenerateCLP/Testing/PointExample1/CMakeLists.txt b/GenerateCLP/Testing/PointExample1/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 3.5)
 
 #-----------------------------------------------------------------------------
 # Configure & Build
diff --git a/GenerateCLP/Testing/Slicer3Example/CMakeLists.txt b/GenerateCLP/Testing/Slicer3Example/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 3.5)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/GenerateCLPTestMacros.cmake)
 
diff --git a/ModuleDescriptionParser/CMakeLists.txt b/ModuleDescriptionParser/CMakeLists.txt
@@ -1,8 +1,7 @@
-project(ModuleDescriptionParser)
-
 #-----------------------------------------------------------------------------
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 3.5)
 #-----------------------------------------------------------------------------
+project(ModuleDescriptionParser CXX)
 
 #-----------------------------------------------------------------------------
 # Set a default build type if none was specified
diff --git a/tclap/CMakeLists.txt b/tclap/CMakeLists.txt
@@ -1,8 +1,7 @@
-project(TCLAP)
-
 #-----------------------------------------------------------------------------
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 3.5)
 #-----------------------------------------------------------------------------
+project(TCLAP)
 
 # --------------------------------------------------------------------------
 # Install headers

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.6)`
	`1`	`+cmake_minimum_required(VERSION 3.5)`
`2`	`2`
`3`	`3`	`include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/GenerateCLPTestMacros.cmake)`
`4`	`4`