summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-21 14:39:21 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-11-21 14:39:21 (GMT)
commit392932fb30d5b611887ad4e8a16901fa43fe1434 (patch)
treea4cc32dc15f1cfeee3b624713661b9209fc3376a
parent91330e950574d13ea4645894a02a5d5f2f94c4f8 (diff)
parent6fc4ab9b28054a0d2f6c5fc63ddd860eeed1ac64 (diff)
downloadCMake-392932fb30d5b611887ad4e8a16901fa43fe1434.zip
CMake-392932fb30d5b611887ad4e8a16901fa43fe1434.tar.gz
CMake-392932fb30d5b611887ad4e8a16901fa43fe1434.tar.bz2
Merge topic 'cmake-credits'
6fc4ab9 Credit Kitware and csimsoft for their maintenance roles
-rw-r--r--Source/QtDialog/CMakeSetupDialog.cxx12
-rw-r--r--Source/cmDocumentation.cxx8
2 files changed, 14 insertions, 6 deletions
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index a7665c8..d482852 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -807,10 +807,14 @@ void CMakeSetupDialog::doDeleteCache()
void CMakeSetupDialog::doAbout()
{
- QString msg = tr("CMake %1\n"
- "Using Qt %2\n"
- "www.cmake.org");
-
+ QString msg = tr(
+ "CMake %1 (cmake.org).\n"
+ "CMake suite maintained by Kitware, Inc. (kitware.com).\n"
+ "Distributed under terms of the BSD 3-Clause License.\n"
+ "\n"
+ "CMake GUI maintained by csimsoft,\n"
+ "built using Qt %2 (qt-project.org).\n"
+ );
msg = msg.arg(cmVersion::GetCMakeVersion());
msg = msg.arg(qVersion());
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index 8e06a1c..8576bf2 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -95,8 +95,12 @@ cmDocumentation::~cmDocumentation()
//----------------------------------------------------------------------------
bool cmDocumentation::PrintVersion(std::ostream& os)
{
- os << this->GetNameString() << " version "
- << cmVersion::GetCMakeVersion() << "\n";
+ os <<
+ this->GetNameString() <<
+ " version " << cmVersion::GetCMakeVersion() << "\n"
+ "\n"
+ "CMake suite maintained by Kitware, Inc. (kitware.com).\n"
+ ;
return true;
}