[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-687-g4ce2ab4
Brad King
brad.king at kitware.com
Mon Oct 24 10:05:11 EDT 2016
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 4ce2ab4db04cb2278c451b03a039caa00e4381f6 (commit)
via be38bde9b8cbabd2b2fd629fc336c04ada52c38d (commit)
from 4f8633666382e9b518a5af001146c9f8abfb9844 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ce2ab4db04cb2278c451b03a039caa00e4381f6
commit 4ce2ab4db04cb2278c451b03a039caa00e4381f6
Merge: 4f86336 be38bde
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 24 10:05:10 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 24 10:05:10 2016 -0400
Merge topic 'separate-compilation' into next
be38bde9 Revise topic 'separate-compilation' style
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be38bde9b8cbabd2b2fd629fc336c04ada52c38d
commit be38bde9b8cbabd2b2fd629fc336c04ada52c38d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 24 10:02:14 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 24 10:02:14 2016 -0400
Revise topic 'separate-compilation' style
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 50c3e7e..b70074e 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -11,8 +11,8 @@
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
-#include "cmVersion.h"
#include "cmState.h"
+#include "cmVersion.h"
#include <stdlib.h>
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index 5bc953a..56be0cb 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmFindLibraryCommand.h"
-#include "cmState.h"
#include "cmGlobalGenerator.h"
+#include "cmState.h"
#include "cmSystemTools.h"
#include "cmVersion.h"
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 1b1d58e..9da4cf6 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmFunctionCommand.h"
-#include "cmSystemTools.h"
#include "cmState.h"
+#include "cmSystemTools.h"
#include "cmake.h"
// define the class for function commands
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index 90813ae..01b41e8 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -4,9 +4,9 @@
#include "cmAlgorithms.h"
#include "cmGlobalGenerator.h"
+#include "cmState.h"
#include "cmStateTypes.h"
#include "cmake.h"
-#include "cmState.h"
// cmGetCMakePropertyCommand
bool cmGetCMakePropertyCommand::InitialPass(
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 1651950..cb8bd58 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -3,9 +3,9 @@
#include "cmMacroCommand.h"
#include "cmAlgorithms.h"
+#include "cmState.h"
#include "cmSystemTools.h"
#include "cmake.h"
-#include "cmState.h"
// define the class for macro commands
class cmMacroHelperCommand : public cmCommand
diff --git a/Source/cmMarkAsAdvancedCommand.cxx b/Source/cmMarkAsAdvancedCommand.cxx
index 46e6043..7297193 100644
--- a/Source/cmMarkAsAdvancedCommand.cxx
+++ b/Source/cmMarkAsAdvancedCommand.cxx
@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmMarkAsAdvancedCommand.h"
-#include "cmSystemTools.h"
#include "cmState.h"
+#include "cmSystemTools.h"
// cmMarkAsAdvancedCommand
bool cmMarkAsAdvancedCommand::InitialPass(std::vector<std::string> const& args,
diff --git a/Source/cmOptionCommand.cxx b/Source/cmOptionCommand.cxx
index 8343d1c..d6efa2c 100644
--- a/Source/cmOptionCommand.cxx
+++ b/Source/cmOptionCommand.cxx
@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmOptionCommand.h"
-#include "cmSystemTools.h"
#include "cmState.h"
+#include "cmSystemTools.h"
// cmOptionCommand
bool cmOptionCommand::InitialPass(std::vector<std::string> const& args,
diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx
index d93df64..9f59db4 100644
--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmSetCommand.h"
-#include "cmSystemTools.h"
#include "cmState.h"
+#include "cmSystemTools.h"
// cmSetCommand
bool cmSetCommand::InitialPass(std::vector<std::string> const& args,
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index 9d88493..552f918 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -7,8 +7,8 @@
#include "cmSetTargetPropertiesCommand.h"
#include "cmSetTestsPropertiesCommand.h"
#include "cmSourceFile.h"
-#include "cmTest.h"
#include "cmState.h"
+#include "cmTest.h"
cmSetPropertyCommand::cmSetPropertyCommand()
{
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index b249013..9626992 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -4,8 +4,8 @@
#include "cmGeneratorExpression.h"
#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
#include "cmState.h"
+#include "cmSystemTools.h"
const char* cmTargetLinkLibrariesCommand::LinkLibraryTypeNames[3] = {
"general", "debug", "optimized"
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index 5ab5c45..6787c8e 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -2,9 +2,9 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmTryRunCommand.h"
+#include "cmState.h"
#include "cmSystemTools.h"
#include "cmTryCompileCommand.h"
-#include "cmState.h"
#include <cmsys/FStream.hxx>
diff --git a/Source/cmUtilitySourceCommand.cxx b/Source/cmUtilitySourceCommand.cxx
index 1a42be3..f98d512 100644
--- a/Source/cmUtilitySourceCommand.cxx
+++ b/Source/cmUtilitySourceCommand.cxx
@@ -4,10 +4,10 @@
#include <string.h>
-#include "cmState.h"
#include "cmMakefile.h"
#include "cmPolicies.h"
#include "cmState.h"
+#include "cmState.h"
#include "cmSystemTools.h"
class cmExecutionStatus;
-----------------------------------------------------------------------
Summary of changes:
Source/cmCPluginAPI.cxx | 2 +-
Source/cmFindLibraryCommand.cxx | 2 +-
Source/cmFunctionCommand.cxx | 2 +-
Source/cmGetCMakePropertyCommand.cxx | 2 +-
Source/cmMacroCommand.cxx | 2 +-
Source/cmMarkAsAdvancedCommand.cxx | 2 +-
Source/cmOptionCommand.cxx | 2 +-
Source/cmSetCommand.cxx | 2 +-
Source/cmSetPropertyCommand.cxx | 2 +-
Source/cmTargetLinkLibrariesCommand.cxx | 2 +-
Source/cmTryRunCommand.cxx | 2 +-
Source/cmUtilitySourceCommand.cxx | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list