Merge topic 'test-minver'

edf7888f70 Tests: Update RunCMake.include cmake_minimum_required version

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !8298

Tests/RunCMake/include/CMP0024-NEW-stderr.txt

@@ -1,8 +1,9 @@
-CMake Error at subdir2/CMakeLists.txt:2 \(include\):
+^CMake Error at subdir2/CMakeLists\.txt:2 \(include\):
   The file
 
-    .*/Tests/RunCMake/include/CMP0024-NEW-build/subdir1/theTargets.cmake
+    [^
+]*/Tests/RunCMake/include/CMP0024-NEW-build/subdir1/theTargets\.cmake
 
-  was generated by the export\(\) command.  It may not be used as the argument
-  to the include\(\) command.  Use ALIAS targets instead to refer to targets by
-  alternative names.
+  was generated by the export\(\) command\.  It may not be used as the argument
+  to the include\(\) command\.  Use ALIAS targets instead to refer to targets by
+  alternative names\.

Tests/RunCMake/include/CMP0024-NEW.cmake

@@ -1,8 +1,6 @@
 
 enable_language(CXX)
 
-cmake_policy(SET CMP0024 NEW)
-
 add_library(foo SHARED empty.cpp)
 
 add_subdirectory(subdir1)

Tests/RunCMake/include/CMP0024-WARN-stderr.txt

@@ -1,14 +1,24 @@
-CMake Warning \(dev\) at subdir2/CMakeLists.txt:2 \(include\):
+^CMake Deprecation Warning at CMP0024-WARN\.cmake:[0-9]+ \(cmake_policy\):
+  Compatibility with CMake < 3\.5 will be removed from a future version of
+  CMake.
+
+  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
+  CMake that the project does not need compatibility with older versions\.
+Call Stack \(most recent call first\):
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Warning \(dev\) at subdir2/CMakeLists\.txt:2 \(include\):
   Policy CMP0024 is not set: Disallow include export result.  Run "cmake
-  --help-policy CMP0024" for policy details.  Use the cmake_policy command to
-  set the policy and suppress this warning.
+  --help-policy CMP0024" for policy details\.  Use the cmake_policy command to
+  set the policy and suppress this warning\.
 
   The file
 
-    .*/Tests/RunCMake/include/CMP0024-WARN-build/subdir1/theTargets.cmake
+    [^
+]*/Tests/RunCMake/include/CMP0024-WARN-build/subdir1/theTargets\.cmake
 
-  was generated by the export\(\) command.  It should not be used as the
-  argument to the include\(\) command.  Use ALIAS targets instead to refer to
-  targets by alternative names.
+  was generated by the export\(\) command\.  It should not be used as the
+  argument to the include\(\) command\.  Use ALIAS targets instead to refer to
+  targets by alternative names\.
 
-This warning is for project developers.  Use -Wno-dev to suppress it.
+This warning is for project developers\.  Use -Wno-dev to suppress it\.

Tests/RunCMake/include/CMP0024-WARN.cmake

@@ -1,3 +1,4 @@
+cmake_policy(VERSION 2.8.12) # Leave CMP0024 unset.
 
 enable_language(CXX)
 

Tests/RunCMake/include/CMakeLists.txt

@@ -1,3 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 project(${RunCMake_TEST} NONE)
 include(${RunCMake_TEST}.cmake)

Tests/RunCMake/include/EmptyString-stderr.txt

@@ -1,5 +1,5 @@
-CMake Warning \(dev\) at EmptyString.cmake:1 \(include\):
+^CMake Warning \(dev\) at EmptyString\.cmake:1 \(include\):
   include\(\) given empty file name \(ignored\).
 Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
-This warning is for project developers.  Use -Wno-dev to suppress it.
+  CMakeLists\.txt:3 \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.$

Tests/RunCMake/include/EmptyStringOptional-stderr.txt

@@ -1,5 +1,5 @@
-CMake Warning \(dev\) at EmptyStringOptional.cmake:1 \(include\):
+^CMake Warning \(dev\) at EmptyStringOptional\.cmake:1 \(include\):
   include\(\) given empty file name \(ignored\).
 Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
-This warning is for project developers.  Use -Wno-dev to suppress it.
+  CMakeLists\.txt:3 \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.$

Tests/RunCMake/include/ExportExportInclude-stderr.txt

@@ -1,6 +1,7 @@
-CMake Error at ExportExportInclude.cmake:6 \(include\):
+^CMake Error at ExportExportInclude.cmake:6 \(include\):
   include could not find requested file:
 
-    .*/Tests/RunCMake/include/ExportExportInclude-build/theTargets.cmake
+    [^
+]*/Tests/RunCMake/include/ExportExportInclude-build/theTargets\.cmake
 Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
+  CMakeLists\.txt:3 \(include\)$

Tests/RunCMake/include/IncludeIsDirectory-stderr.txt

@@ -1,6 +1,7 @@
-CMake Error at IncludeIsDirectory.cmake:1 \(include\):
+^CMake Error at IncludeIsDirectory.cmake:1 \(include\):
   include requested file is a directory:
 
-    .*/Tests/RunCMake/include/IncludeIsDirectory-build
+    [^
+]*/Tests/RunCMake/include/IncludeIsDirectory-build
 Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
+  CMakeLists\.txt:3 \(include\)$

Tests/RunCMake/include/IncludeMalformed-stderr.txt

@@ -1,13 +1,12 @@
-CMake Error at malformedInclude.cmake:1:
-  Parse error.  Function missing ending "\)".  End of file reached.
+^CMake Error at malformedInclude\.cmake:1:
+  Parse error\.  Function missing ending "\)"\.  End of file reached\.
 Call Stack \(most recent call first\):
-  IncludeMalformed.cmake:1 \(include\)
-  CMakeLists.txt:3 \(include\)
-
-
-CMake Error at IncludeMalformed.cmake:1 \(include\):
+  IncludeMalformed\.cmake:1 \(include\)
+  CMakeLists\.txt:3 \(include\)
++
+CMake Error at IncludeMalformed\.cmake:1 \(include\):
   include could not load requested file:
 
-    malformedInclude.cmake
+    malformedInclude\.cmake
 Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
+  CMakeLists\.txt:3 \(include\)$