[Cmake-commits] CMake branch, next, updated. v2.8.3-989-g364d0db
Brad King
brad.king at kitware.com
Fri Dec 17 10:34:45 EST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 364d0db69880a756891998cb85bd3b7f411cac44 (commit)
via ad25a968b9e47e9e966d166dd0e494dc684ebd66 (commit)
via c128abe383e2f08e3f3e916f9b64356ca47056d1 (commit)
via 9bcaff02ff066e9bdd69e3e1e3134aa65c53c121 (commit)
from 5d6a1231b5b7daeecbc86062364698269a9830cc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=364d0db69880a756891998cb85bd3b7f411cac44
commit 364d0db69880a756891998cb85bd3b7f411cac44
Merge: 5d6a123 ad25a96
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 17 10:34:41 2010 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 17 10:34:41 2010 -0500
Merge topic 'dev/strict-mode' into next
ad25a96 Merge branch 'ImprovedDotSupport2' into dev/strict-mode
c128abe Merge branch 'AddCMAKE_CURRENT_LIST_DIR' into dev/strict-mode
9bcaff0 Merge branch 'cmake-guiRememberAdvancedCheckbox' into dev/strict-mode
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad25a968b9e47e9e966d166dd0e494dc684ebd66
commit ad25a968b9e47e9e966d166dd0e494dc684ebd66
Merge: c128abe 78c86f4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 17 10:32:01 2010 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 17 10:32:01 2010 -0500
Merge branch 'ImprovedDotSupport2' into dev/strict-mode
Conflicts:
Source/cmake.cxx
diff --cc Source/cmake.h
index b132164,435d38b..4d348bb
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@@ -210,10 -212,9 +212,10 @@@ class cmak
/** Check if a command exists. */
bool CommandExists(const char* name) const;
-
+
///! Parse command line arguments
- void SetArgs(const std::vector<std::string>&);
+ void SetArgs(const std::vector<std::string>&,
+ bool directoriesSetBefore = false);
///! Is this cmake running as a result of a TRY_COMPILE command
bool GetIsInTryCompile() { return this->InTryCompile; }
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c128abe383e2f08e3f3e916f9b64356ca47056d1
commit c128abe383e2f08e3f3e916f9b64356ca47056d1
Merge: 9bcaff0 b011840
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 17 10:31:41 2010 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 17 10:31:41 2010 -0500
Merge branch 'AddCMAKE_CURRENT_LIST_DIR' into dev/strict-mode
Conflicts:
Source/cmMakefile.cxx
diff --cc Source/cmMakefile.cxx
index a97ec10,e32619a..bb8316e
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@@ -625,7 -610,8 +625,10 @@@ bool cmMakefile::ReadListFile(const cha
}
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", filenametoread);
+ this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
+ this->AddDefinition("CMAKE_CURRENT_LIST_DIR",
+ cmSystemTools::GetFilenamePath(filenametoread).c_str());
++ this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
// try to see if the list file is the top most
// list file for a project, and if it is, then it
@@@ -658,9 -644,9 +661,12 @@@
*fullPath = "";
}
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str());
+ this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE");
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str());
+ this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
+ this->AddDefinition("CMAKE_CURRENT_LIST_DIR",
+ cmSystemTools::GetFilenamePath(currentFile).c_str());
++ this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
return false;
}
// add this list file to the list of dependencies
@@@ -700,9 -686,9 +706,12 @@@
}
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str());
+ this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE");
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str());
+ this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
+ this->AddDefinition("CMAKE_CURRENT_LIST_DIR",
+ cmSystemTools::GetFilenamePath(currentFile).c_str());
++ this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
// pop the listfile off the stack
this->ListFileStack.pop_back();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bcaff02ff066e9bdd69e3e1e3134aa65c53c121
commit 9bcaff02ff066e9bdd69e3e1e3134aa65c53c121
Merge: 544d0c3 3d13502
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 17 10:31:19 2010 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 17 10:31:19 2010 -0500
Merge branch 'cmake-guiRememberAdvancedCheckbox' into dev/strict-mode
Conflicts:
Source/QtDialog/CMakeSetupDialog.cxx
diff --cc Source/QtDialog/CMakeSetupDialog.cxx
index 663753e,29fcfc0..779c14e
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@@ -99,30 -103,23 +103,30 @@@ CMakeSetupDialog::CMakeSetupDialog(
this->ConfigureAction = ToolsMenu->addAction(tr("&Configure"));
// prevent merging with Preferences menu item on Mac OS X
this->ConfigureAction->setMenuRole(QAction::NoRole);
- QObject::connect(this->ConfigureAction, SIGNAL(triggered(bool)),
+ QObject::connect(this->ConfigureAction, SIGNAL(triggered(bool)),
this, SLOT(doConfigure()));
this->GenerateAction = ToolsMenu->addAction(tr("&Generate"));
- QObject::connect(this->GenerateAction, SIGNAL(triggered(bool)),
+ QObject::connect(this->GenerateAction, SIGNAL(triggered(bool)),
this, SLOT(doGenerate()));
QAction* showChangesAction = ToolsMenu->addAction(tr("&Show My Changes"));
- QObject::connect(showChangesAction, SIGNAL(triggered(bool)),
+ QObject::connect(showChangesAction, SIGNAL(triggered(bool)),
this, SLOT(showUserChanges()));
#if defined(Q_WS_MAC)
- this->InstallForCommandLineAction
+ this->InstallForCommandLineAction
= ToolsMenu->addAction(tr("&Install For Command Line Use"));
- QObject::connect(this->InstallForCommandLineAction, SIGNAL(triggered(bool)),
+ QObject::connect(this->InstallForCommandLineAction, SIGNAL(triggered(bool)),
this, SLOT(doInstallForCommandLine()));
- #endif
+ #endif
QMenu* OptionsMenu = this->menuBar()->addMenu(tr("&Options"));
- this->SuppressDevWarningsAction = OptionsMenu->addAction(tr("&Suppress dev Warnings (-Wno-dev)"));
+ this->SuppressDevWarningsAction =
+ OptionsMenu->addAction(tr("&Suppress dev Warnings (-Wno-dev)"));
this->SuppressDevWarningsAction->setCheckable(true);
+ this->WarnUninitializedAction =
+ OptionsMenu->addAction(tr("&Warn Uninitialized (--warn-uninitialized)"));
+ this->WarnUninitializedAction->setCheckable(true);
+ this->WarnUnusedAction =
+ OptionsMenu->addAction(tr("&Warn Unused (--warn-unused-vars)"));
+ this->WarnUnusedAction->setCheckable(true);
QAction* debugAction = OptionsMenu->addAction(tr("&Debug Output"));
debugAction->setCheckable(true);
@@@ -232,28 -229,22 +236,29 @@@ void CMakeSetupDialog::initialize(
SIGNAL(generatorChanged(QString)),
this, SLOT(updateGeneratorLabel(QString)));
this->updateGeneratorLabel(QString());
-
+
QObject::connect(this->CacheValues->cacheModel(),
- SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ SIGNAL(dataChanged(QModelIndex,QModelIndex)),
this, SLOT(setCacheModified()));
-
+
QObject::connect(this->CacheValues->selectionModel(),
- SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
+ SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
this, SLOT(selectionChanged()));
- QObject::connect(this->RemoveEntry, SIGNAL(clicked(bool)),
+ QObject::connect(this->RemoveEntry, SIGNAL(clicked(bool)),
this, SLOT(removeSelectedCacheEntries()));
- QObject::connect(this->AddEntry, SIGNAL(clicked(bool)),
+ QObject::connect(this->AddEntry, SIGNAL(clicked(bool)),
this, SLOT(addCacheEntry()));
- QObject::connect(this->SuppressDevWarningsAction, SIGNAL(triggered(bool)),
+ QObject::connect(this->SuppressDevWarningsAction, SIGNAL(triggered(bool)),
this->CMakeThread->cmakeInstance(), SLOT(setSuppressDevWarnings(bool)));
+
+ QObject::connect(this->WarnUninitializedAction, SIGNAL(triggered(bool)),
+ this->CMakeThread->cmakeInstance(),
+ SLOT(setWarnUninitializedMode(bool)));
+ QObject::connect(this->WarnUnusedAction, SIGNAL(triggered(bool)),
+ this->CMakeThread->cmakeInstance(),
+ SLOT(setWarnUnusedMode(bool)));
-
++
if(!this->SourceDirectory->text().isEmpty() ||
!this->BinaryDirectory->lineEdit()->text().isEmpty())
{
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list