From 933f2d9f203bc5fabf3040d9361ba4e0cb637b9b Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sun, 16 Mar 2014 18:54:49 +0100 Subject: [PATCH 1/1] Update README and COPYING-CMAKE-SCRIPTS Just to make clear how to handle the files we bundle. --- cmake/modules/COPYING-CMAKE-SCRIPTS | 4 ++++ cmake/modules/README | 22 +++++----------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/cmake/modules/COPYING-CMAKE-SCRIPTS b/cmake/modules/COPYING-CMAKE-SCRIPTS index 4b417765..cb8a9905 100644 --- a/cmake/modules/COPYING-CMAKE-SCRIPTS +++ b/cmake/modules/COPYING-CMAKE-SCRIPTS @@ -1,3 +1,7 @@ +This is the standard license for CMake scripts. Please note that some +of the CMake scripts we bundle come with their own license as indicated +in the file, in which case that one applies. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/cmake/modules/README b/cmake/modules/README index 560323d6..b53bc324 100644 --- a/cmake/modules/README +++ b/cmake/modules/README @@ -1,17 +1,5 @@ -Most of these modules have been copied from KDE's repository. - -Files starting with Quassel* are solely created by us. - -Below is the contents of KDE's original README: - ---------8<-------------------------------------------------------------- -these are additional cmake modules required for compiling KDE3 or KDE4 -applications with cmake. Some of them are enhanced versions of the files -coming with cmake, some of them are NOT yet part of cmake. -To use them, copy them into the cmake Module directory or -run "cmake ." followed by "make install" - -Alex --------->8-------------------------------------------------------------- - -Thank you Alex! +We bundle some CMake scripts that are not part of CMake itself, for convenience +on platforms that do not have a standard location for packages to put their +CMake support into. Most of those scripts originate from the KDE community; +some are from other sources. Please see the files themselves for copyright +and license statements. -- 2.20.1