diff options
author | Brad King <brad.king@kitware.com> | 2016-09-28 12:05:10 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-28 12:05:10 (GMT) |
commit | c1f97af640231ff0cb90e4a1d9a567a2ee85daa5 (patch) | |
tree | dab41972372ca0f11cbb30ac9c2e6074f121f8fc /Tests | |
parent | 8021f64029d0805efa17fe439d7ce1356bec7938 (diff) | |
parent | 19671831cfd7f06496fa035f965e2aea6b7a45b1 (diff) | |
download | CMake-c1f97af640231ff0cb90e4a1d9a567a2ee85daa5.zip CMake-c1f97af640231ff0cb90e4a1d9a567a2ee85daa5.tar.gz CMake-c1f97af640231ff0cb90e4a1d9a567a2ee85daa5.tar.bz2 |
Merge topic 'simplify-license-notices'
19671831 Help: Update cmake-developer(7) module license docs for new notice
756169ac Tests: Update ModuleNotices test for new notice
845d86bc Utilities/Scripts: Remove temporary script that filtered license notices
86578ecc Simplify CMake per-source license notices
b7180cfe Utilities/Scripts: Add temporary script to filter license notices
7feb4ecc Copyright.txt: Add notice of copyright by contributors
78f77f60 Utilities/KWStyle: Remove unused header check reference file
681e0429 Tests: Fix RunCMake.CTest output match to tolerate line number changes
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CMakeLib/testFindPackageCommand.cxx | 13 | ||||
-rw-r--r-- | Tests/CMakeLib/testGeneratedFileStream.cxx | 13 | ||||
-rw-r--r-- | Tests/CMakeLib/testRST.cxx | 13 | ||||
-rw-r--r-- | Tests/CMakeLib/testSystemTools.cxx | 13 | ||||
-rw-r--r-- | Tests/CMakeLib/testUTF8.cxx | 13 | ||||
-rw-r--r-- | Tests/CMakeLib/testXMLSafe.cxx | 13 | ||||
-rw-r--r-- | Tests/CMakeTests/ModuleNoticesTest.cmake.in | 23 | ||||
-rw-r--r-- | Tests/CheckFortran.cmake | 14 | ||||
-rw-r--r-- | Tests/QtAutogen/abc.cpp | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/abc.h | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/abc_p.h | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/bar.cpp | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/blub.cpp | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/blub.h | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/foo.cpp | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/foo.h | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/sub/bar.h | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/xyz.cpp | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/xyz.h | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/yaf.cpp | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/yaf.h | 15 | ||||
-rw-r--r-- | Tests/QtAutogen/yaf_p.h | 15 | ||||
-rw-r--r-- | Tests/RunCMake/CTest/BeforeProject-stderr.txt | 6 |
23 files changed, 50 insertions, 281 deletions
diff --git a/Tests/CMakeLib/testFindPackageCommand.cxx b/Tests/CMakeLib/testFindPackageCommand.cxx index 1cddb0e..7622756 100644 --- a/Tests/CMakeLib/testFindPackageCommand.cxx +++ b/Tests/CMakeLib/testFindPackageCommand.cxx @@ -1,14 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2000-2011 Kitware, Inc., Insight Software Consortium - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFindPackageCommand.h" #include <iostream> diff --git a/Tests/CMakeLib/testGeneratedFileStream.cxx b/Tests/CMakeLib/testGeneratedFileStream.cxx index b419b9e..1d2ec32 100644 --- a/Tests/CMakeLib/testGeneratedFileStream.cxx +++ b/Tests/CMakeLib/testGeneratedFileStream.cxx @@ -1,14 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2000-2011 Kitware, Inc., Insight Software Consortium - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGeneratedFileStream.h" #include "cmSystemTools.h" diff --git a/Tests/CMakeLib/testRST.cxx b/Tests/CMakeLib/testRST.cxx index cc92693..e1b0903 100644 --- a/Tests/CMakeLib/testRST.cxx +++ b/Tests/CMakeLib/testRST.cxx @@ -1,14 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2000-2013 Kitware, Inc., Insight Software Consortium - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmRST.h" #include "cmSystemTools.h" diff --git a/Tests/CMakeLib/testSystemTools.cxx b/Tests/CMakeLib/testSystemTools.cxx index 5b5c8d2..b16b088 100644 --- a/Tests/CMakeLib/testSystemTools.cxx +++ b/Tests/CMakeLib/testSystemTools.cxx @@ -1,14 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2000-2011 Kitware, Inc., Insight Software Consortium - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmSystemTools.h" #include <iostream> diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx index c99a925..fb5f3d8 100644 --- a/Tests/CMakeLib/testUTF8.cxx +++ b/Tests/CMakeLib/testUTF8.cxx @@ -1,14 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2000-2009 Kitware, Inc., Insight Software Consortium - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include <cm_utf8.h> #include <stdio.h> diff --git a/Tests/CMakeLib/testXMLSafe.cxx b/Tests/CMakeLib/testXMLSafe.cxx index c4aaf17..6c59128 100644 --- a/Tests/CMakeLib/testXMLSafe.cxx +++ b/Tests/CMakeLib/testXMLSafe.cxx @@ -1,14 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2000-2009 Kitware, Inc., Insight Software Consortium - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmXMLSafe.h" #include <sstream> diff --git a/Tests/CMakeTests/ModuleNoticesTest.cmake.in b/Tests/CMakeTests/ModuleNoticesTest.cmake.in index 7bea0af..7ae6607 100644 --- a/Tests/CMakeTests/ModuleNoticesTest.cmake.in +++ b/Tests/CMakeTests/ModuleNoticesTest.cmake.in @@ -1,21 +1,8 @@ -# Regex to match copyright/license notices. -# We require the Kitware copyright on the first line, but this can -# match any additional copyright holder notices. -set(notice_regex " -#============================================================================= -# Copyright (20[0-9][0-9]-)?20[0-9][0-9] [^\n]+( -# Copyright (20[0-9][0-9]-)?20[0-9][0-9] [^\n]+)* -# -# Distributed under the OSI-approved BSD License \\(the \"License\"\\); -# see accompanying file Copyright\\.txt for details\\. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\\. -# See the License for more information\\. -#============================================================================= -# \\(To distribute this file outside of CMake, substitute the full -# License text for the above reference.\\) -") +# Regex to match license notices at the top of module files. +set(notice_regex [[^# Distributed under the OSI-approved BSD 3-Clause License\. See accompanying +# file Copyright\.txt or https://cmake\.org/licensing for details\. + +]]) string(REPLACE "\n" "\r?\n" notice_regex "${notice_regex}") string(REPLACE "\r\r" "\r" notice_regex "${notice_regex}") diff --git a/Tests/CheckFortran.cmake b/Tests/CheckFortran.cmake index 678bb82..93990ad 100644 --- a/Tests/CheckFortran.cmake +++ b/Tests/CheckFortran.cmake @@ -1,16 +1,6 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. -#============================================================================= -# Copyright 2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) if(NOT DEFINED CMAKE_Fortran_COMPILER) set(_desc "Looking for a Fortran compiler") diff --git a/Tests/QtAutogen/abc.cpp b/Tests/QtAutogen/abc.cpp index b19c2a1..2929b92 100644 --- a/Tests/QtAutogen/abc.cpp +++ b/Tests/QtAutogen/abc.cpp @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "abc.h" #include "abc_p.h" diff --git a/Tests/QtAutogen/abc.h b/Tests/QtAutogen/abc.h index dc085b1..ec5f411 100644 --- a/Tests/QtAutogen/abc.h +++ b/Tests/QtAutogen/abc.h @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #ifndef ABC_H #define ABC_H diff --git a/Tests/QtAutogen/abc_p.h b/Tests/QtAutogen/abc_p.h index c9139b7..be98487 100644 --- a/Tests/QtAutogen/abc_p.h +++ b/Tests/QtAutogen/abc_p.h @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #ifndef ABC_P_H #define ABC_P_H diff --git a/Tests/QtAutogen/bar.cpp b/Tests/QtAutogen/bar.cpp index 2eefd08..734bd7a 100644 --- a/Tests/QtAutogen/bar.cpp +++ b/Tests/QtAutogen/bar.cpp @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "sub/bar.h" #include <stdio.h> diff --git a/Tests/QtAutogen/blub.cpp b/Tests/QtAutogen/blub.cpp index bbebf08..1c497e0 100644 --- a/Tests/QtAutogen/blub.cpp +++ b/Tests/QtAutogen/blub.cpp @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "blub.h" #include <stdio.h> diff --git a/Tests/QtAutogen/blub.h b/Tests/QtAutogen/blub.h index 7097b67..ff79878 100644 --- a/Tests/QtAutogen/blub.h +++ b/Tests/QtAutogen/blub.h @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #ifndef BLUB_H #define BLUB_H diff --git a/Tests/QtAutogen/foo.cpp b/Tests/QtAutogen/foo.cpp index 23ecc30..f665eee 100644 --- a/Tests/QtAutogen/foo.cpp +++ b/Tests/QtAutogen/foo.cpp @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "foo.h" #include <stdio.h> diff --git a/Tests/QtAutogen/foo.h b/Tests/QtAutogen/foo.h index 98f6292..3e03fe6 100644 --- a/Tests/QtAutogen/foo.h +++ b/Tests/QtAutogen/foo.h @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #ifndef FOO_H #define FOO_H diff --git a/Tests/QtAutogen/sub/bar.h b/Tests/QtAutogen/sub/bar.h index c96e123..e4093f6 100644 --- a/Tests/QtAutogen/sub/bar.h +++ b/Tests/QtAutogen/sub/bar.h @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #ifndef BAR_H #define BAR_H diff --git a/Tests/QtAutogen/xyz.cpp b/Tests/QtAutogen/xyz.cpp index c3c598e..e46c9d3 100644 --- a/Tests/QtAutogen/xyz.cpp +++ b/Tests/QtAutogen/xyz.cpp @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "xyz.h" #include <stdio.h> diff --git a/Tests/QtAutogen/xyz.h b/Tests/QtAutogen/xyz.h index 1ba09a3..8b813fd 100644 --- a/Tests/QtAutogen/xyz.h +++ b/Tests/QtAutogen/xyz.h @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #ifndef XYZ_H #define XYZ_H diff --git a/Tests/QtAutogen/yaf.cpp b/Tests/QtAutogen/yaf.cpp index 09335a9..70e26aa 100644 --- a/Tests/QtAutogen/yaf.cpp +++ b/Tests/QtAutogen/yaf.cpp @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #include "yaf.h" #include "yaf_p.h" diff --git a/Tests/QtAutogen/yaf.h b/Tests/QtAutogen/yaf.h index 9755ca0..f271061 100644 --- a/Tests/QtAutogen/yaf.h +++ b/Tests/QtAutogen/yaf.h @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #ifndef YAF_H #define YAF_H diff --git a/Tests/QtAutogen/yaf_p.h b/Tests/QtAutogen/yaf_p.h index cf317b8..ea5eed6 100644 --- a/Tests/QtAutogen/yaf_p.h +++ b/Tests/QtAutogen/yaf_p.h @@ -1,16 +1,5 @@ -/*============================================================================ - CMake - Cross Platform Makefile Generator - Copyright 2004-2011 Kitware, Inc. - Copyright 2011 Alexander Neundorf (neundorf@kde.org) - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ - +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ #ifndef YAF_P_H #define YAF_P_H diff --git a/Tests/RunCMake/CTest/BeforeProject-stderr.txt b/Tests/RunCMake/CTest/BeforeProject-stderr.txt index d61856c..cfbe4d2 100644 --- a/Tests/RunCMake/CTest/BeforeProject-stderr.txt +++ b/Tests/RunCMake/CTest/BeforeProject-stderr.txt @@ -1,6 +1,6 @@ -CMake Error at .*/Modules/CTestTargets.cmake:20 \(message\): +CMake Error at .*/Modules/CTestTargets.cmake:[0-9]+ \(message\): Do not include\(CTest\) before calling project\(\). Call Stack \(most recent call first\): .*/Modules/CTest.cmake:[0-9]+ \(include\) - BeforeProject.cmake:1 \(include\) - CMakeLists.txt:5 \(include\) + BeforeProject.cmake:[0-9]+ \(include\) + CMakeLists.txt:[0-9]+ \(include\) |