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 /Auxiliary | |
| 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 'Auxiliary')
| -rw-r--r-- | Auxiliary/cmake-mode.el | 13 | ||||
| -rw-r--r-- | Auxiliary/cmake.m4 | 13 |
2 files changed, 4 insertions, 22 deletions
diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el index f29b59b..a1b43c5 100644 --- a/Auxiliary/cmake-mode.el +++ b/Auxiliary/cmake-mode.el @@ -1,16 +1,7 @@ ;;; cmake-mode.el --- major-mode for editing CMake sources -;============================================================================= -; 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. ;------------------------------------------------------------------------------ diff --git a/Auxiliary/cmake.m4 b/Auxiliary/cmake.m4 index a374a3b..3ef4c16 100644 --- a/Auxiliary/cmake.m4 +++ b/Auxiliary/cmake.m4 @@ -1,14 +1,5 @@ -dnl ============================================================================ -dnl CMake - Cross Platform Makefile Generator -dnl Copyright 2011 Matthias Kretz, kretz@kde.org -dnl -dnl Distributed under the OSI-approved BSD License (the "License"); -dnl see accompanying file Copyright.txt for details. -dnl -dnl This software is distributed WITHOUT ANY WARRANTY; without even the -dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -dnl See the License for more information. -dnl ============================================================================ +dnl Distributed under the OSI-approved BSD 3-Clause License. See accompanying +dnl file Copyright.txt or https://cmake.org/licensing for details. AC_DEFUN([CMAKE_FIND_BINARY], [AC_ARG_VAR([CMAKE_BINARY], [path to the cmake binary])dnl |