[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-401-g93f32ef
Stephen Kelly
steveire at gmail.com
Tue Feb 17 14:39:47 EST 2015
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 93f32ef43a61c80e5084b0c8e03bf8db7b1ffaea (commit)
via 6652afe66961bcbb5ff17dd7b8a3a91da62f2712 (commit)
via 75661fdfd94fef4b8f1e8112aa75d76d1cc366e6 (commit)
via 10e53e230811b94701d86e8c78e38df5abf69ee8 (commit)
via 74906322585034968142e1d1663f604e2c97332c (commit)
via 2acd04c96624ce530edcb0ca991bddad7f70023e (commit)
via 2d833232a35715e412a40ee6207137ecfee7da36 (commit)
via 26602cf56c4697a589f320809afa7a127268d09f (commit)
via cfb8483412761e567f64343ccc008b44150a901b (commit)
via 6010f93632c8de9405bc97e40fc06f5949c09976 (commit)
via 0550b9e330d75dfcb02257c998706759574cd9c0 (commit)
via 1ee4721f7c7d0d889e00c0a2cdb799e71a4b5574 (commit)
via 62429a1e54ec443edda35074bc66805d6e602f89 (commit)
via c697c1fafef16f00e4ec6a72d12eb3a43c01879a (commit)
from ff7bdd5e81b172fb44f6a3b3eb395290becc5e18 (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=93f32ef43a61c80e5084b0c8e03bf8db7b1ffaea
commit 93f32ef43a61c80e5084b0c8e03bf8db7b1ffaea
Merge: ff7bdd5 6652afe
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 14:39:45 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 14:39:45 2015 -0500
Merge topic 'minor-cleanups' into next
6652afe6 CTest: Use clear instead of erase-all.
75661fdf cmListCommand: Move size variable out of loop.
10e53e23 cmAlgorithms: Add missing const to functors.
74906322 cmAlgorithms: Remove sort of already-sorted container.
2acd04c9 cmcmd: Remove some comment copy-pasta.
2d833232 cmCoreTryCompile: Remove variable assignment.
26602cf5 cmLocalGenerator: Move variable population inside of condition.
cfb84834 Update comment to match recent dashboard testing.
6010f936 Revert "cmGlobalGenerator: Fix value type pushed into autogens vector"
0550b9e3 Revert "Attempt to fix the compile of cmake on Sun CC."
1ee4721f Help: Fix formatting of command parameter.
62429a1e cmGlobalGenerator: Remove unneeded pointer check.
c697c1fa cmTarget: Remove template argument workaround.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6652afe66961bcbb5ff17dd7b8a3a91da62f2712
commit 6652afe66961bcbb5ff17dd7b8a3a91da62f2712
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 13:42:17 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 20:18:59 2015 +0100
CTest: Use clear instead of erase-all.
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index d90aeb7..4cdce71 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -32,8 +32,7 @@ cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler()
//----------------------------------------------------------------------
void cmCTestBuildAndTestHandler::Initialize()
{
- this->BuildTargets.erase(
- this->BuildTargets.begin(), this->BuildTargets.end());
+ this->BuildTargets.clear();
this->Superclass::Initialize();
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75661fdfd94fef4b8f1e8112aa75d76d1cc366e6
commit 75661fdfd94fef4b8f1e8112aa75d76d1cc366e6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:20:56 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 20:18:58 2015 +0100
cmListCommand: Move size variable out of loop.
Re-use it where possible in two instances.
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 98dcef1..0c6adfd 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -202,12 +202,12 @@ bool cmListCommand::HandleGetCommand(std::vector<std::string> const& args)
std::string value;
size_t cc;
const char* sep = "";
+ size_t nitem = varArgsExpanded.size();
for ( cc = 2; cc < args.size()-1; cc ++ )
{
int item = atoi(args[cc].c_str());
value += sep;
sep = ";";
- size_t nitem = varArgsExpanded.size();
if ( item < 0 )
{
item = (int)nitem + item;
@@ -216,8 +216,8 @@ bool cmListCommand::HandleGetCommand(std::vector<std::string> const& args)
{
std::ostringstream str;
str << "index: " << item << " out of range (-"
- << varArgsExpanded.size() << ", "
- << varArgsExpanded.size()-1 << ")";
+ << nitem << ", "
+ << nitem - 1 << ")";
this->SetError(str.str());
return false;
}
@@ -485,10 +485,10 @@ bool cmListCommand::HandleRemoveAtCommand(
size_t cc;
std::vector<size_t> removed;
+ size_t nitem = varArgsExpanded.size();
for ( cc = 2; cc < args.size(); ++ cc )
{
int item = atoi(args[cc].c_str());
- size_t nitem = varArgsExpanded.size();
if ( item < 0 )
{
item = (int)nitem + item;
@@ -497,8 +497,8 @@ bool cmListCommand::HandleRemoveAtCommand(
{
std::ostringstream str;
str << "index: " << item << " out of range (-"
- << varArgsExpanded.size() << ", "
- << varArgsExpanded.size()-1 << ")";
+ << nitem << ", "
+ << nitem - 1 << ")";
this->SetError(str.str());
return false;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10e53e230811b94701d86e8c78e38df5abf69ee8
commit 10e53e230811b94701d86e8c78e38df5abf69ee8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 19:32:52 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 20:18:57 2015 +0100
cmAlgorithms: Add missing const to functors.
diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index dc4f275..8491838 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -99,7 +99,7 @@ template<typename Container,
bool valueTypeIsPair = cmIsPair<typename Container::value_type>::value>
struct DefaultDeleter
{
- void operator()(typename Container::value_type value) {
+ void operator()(typename Container::value_type value) const {
delete value;
}
};
@@ -107,7 +107,7 @@ struct DefaultDeleter
template<typename Container>
struct DefaultDeleter<Container, /* valueTypeIsPair = */ true>
{
- void operator()(typename Container::value_type value) {
+ void operator()(typename Container::value_type value) const {
delete value.second;
}
};
@@ -163,7 +163,7 @@ struct BinarySearcher
{
}
- bool operator()(argument_type const& item)
+ bool operator()(argument_type const& item) const
{
return std::binary_search(m_range.begin(), m_range.end(), item);
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74906322585034968142e1d1663f604e2c97332c
commit 74906322585034968142e1d1663f604e2c97332c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 09:02:03 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 20:18:57 2015 +0100
cmAlgorithms: Remove sort of already-sorted container.
The indices is populated by an increasing number.
diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index a996088..dc4f275 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -275,7 +275,6 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
{
return r.end();
}
- std::sort(indices.begin(), indices.end());
return cmRemoveIndices(r, indices);
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2acd04c96624ce530edcb0ca991bddad7f70023e
commit 2acd04c96624ce530edcb0ca991bddad7f70023e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 22:14:08 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 20:18:56 2015 +0100
cmcmd: Remove some comment copy-pasta.
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 5c93975..6a7dc6e 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -287,8 +287,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
}
#if defined(CMAKE_BUILD_WITH_CMAKE)
- // Command to create a symbolic link. Fails on platforms not
- // supporting them.
else if (args[1] == "environment" )
{
std::vector<std::string> env = cmSystemTools::GetEnvironmentVariables();
@@ -352,8 +350,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
{
for (std::string::size_type cc = 2; cc < args.size(); cc ++)
{
- // Complain if the file could not be removed, still exists,
- // and the -f option was not given.
if(!cmSystemTools::Touch(args[cc], true))
{
return 1;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d833232a35715e412a40ee6207137ecfee7da36
commit 2d833232a35715e412a40ee6207137ecfee7da36
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 21:03:34 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:23:27 2015 +0100
cmCoreTryCompile: Remove variable assignment.
The variable is not a reference, and we return in the same scope
after assigning, so it has no effect.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index d9369e6..8e20c14 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -685,8 +685,7 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName)
command += tmpOutputFile;
if(cmSystemTools::FileExists(command.c_str()))
{
- tmpOutputFile = cmSystemTools::CollapseFullPath(command);
- this->OutputFile = tmpOutputFile;
+ this->OutputFile = cmSystemTools::CollapseFullPath(command);
return;
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26602cf56c4697a589f320809afa7a127268d09f
commit 26602cf56c4697a589f320809afa7a127268d09f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 08:08:26 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:21:36 2015 +0100
cmLocalGenerator: Move variable population inside of condition.
It is only used in the condition, so no need to look for uses
elsewhere when reading the code.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 35956ad..6a6135b 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1952,14 +1952,13 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
// Write the library flags to the build rule.
fout << linkLibs;
- // Get the RPATH entries.
- std::vector<std::string> runtimeDirs;
- cli.GetRPath(runtimeDirs, relink);
-
// Check what kind of rpath flags to use.
if(cli.GetRuntimeSep().empty())
{
// Each rpath entry gets its own option ("-R a -R b -R c")
+ std::vector<std::string> runtimeDirs;
+ cli.GetRPath(runtimeDirs, relink);
+
std::string rpath;
for(std::vector<std::string>::iterator ri = runtimeDirs.begin();
ri != runtimeDirs.end(); ++ri)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfb8483412761e567f64343ccc008b44150a901b
commit cfb8483412761e567f64343ccc008b44150a901b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 19:48:21 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:20:23 2015 +0100
Update comment to match recent dashboard testing.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 8a83c3e..69bc2a1 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -520,8 +520,8 @@ if(APPLE)
target_link_libraries(CMakeLib "-framework CoreFoundation")
endif()
-# On some platforms we need the rpcrt4 library for the VS 7 generators.
if(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW)
+ # We need the rpcrt4 library for at least the VS7-VC10 generators.
target_link_libraries(CMakeLib rpcrt4)
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6010f93632c8de9405bc97e40fc06f5949c09976
commit 6010f93632c8de9405bc97e40fc06f5949c09976
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 1 13:41:54 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:19:06 2015 +0100
Revert "cmGlobalGenerator: Fix value type pushed into autogens vector"
This reverts commit ae6fc555a7e8929f6d96545bd1137c8bd378566d.
Use the more-natural make_pair algorithm. The compiler motivating
the need for this is not supported as a host anymore.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 227462d..1de4a59 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1387,7 +1387,7 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
cmQtAutoGenerators autogen;
if(autogen.InitializeAutogenTarget(&target))
{
- autogens.push_back(AutogensType::value_type(autogen, &target));
+ autogens.push_back(std::make_pair(autogen, &target));
}
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0550b9e330d75dfcb02257c998706759574cd9c0
commit 0550b9e330d75dfcb02257c998706759574cd9c0
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 1 13:41:48 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:18:12 2015 +0100
Revert "Attempt to fix the compile of cmake on Sun CC."
This reverts commit a573a856581118d7a9d8dd7be1f613ba7b1ddb04.
The workaround is not needed on supported SolarisStudio compilers.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 6692a92..ba18faa 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -24,10 +24,7 @@
#include <errno.h>
//----------------------------------------------------------------------------
-#if !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x510
-static
-#endif
-void reportError(cmGeneratorExpressionContext *context,
+static void reportError(cmGeneratorExpressionContext *context,
const std::string &expr, const std::string &result)
{
context->HadError = true;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ee4721f7c7d0d889e00c0a2cdb799e71a4b5574
commit 1ee4721f7c7d0d889e00c0a2cdb799e71a4b5574
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 20:01:46 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:18:11 2015 +0100
Help: Fix formatting of command parameter.
diff --git a/Help/command/target_compile_definitions.rst b/Help/command/target_compile_definitions.rst
index 3c9fe87..8bd3233 100644
--- a/Help/command/target_compile_definitions.rst
+++ b/Help/command/target_compile_definitions.rst
@@ -9,7 +9,7 @@ Add compile definitions to a target.
<INTERFACE|PUBLIC|PRIVATE> [items1...]
[<INTERFACE|PUBLIC|PRIVATE> [items2...] ...])
-Specify compile definitions to use when compiling a given <target. The
+Specify compile definitions to use when compiling a given ``<target>``. The
named ``<target>`` must have been created by a command such as
:command:`add_executable` or :command:`add_library` and must not be an
:ref:`Imported Target <Imported Targets>`.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62429a1e54ec443edda35074bc66805d6e602f89
commit 62429a1e54ec443edda35074bc66805d6e602f89
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 20:00:19 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:18:11 2015 +0100
cmGlobalGenerator: Remove unneeded pointer check.
Deleting nullptr is ok.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6d0fedc..227462d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -74,11 +74,7 @@ cmGlobalGenerator::cmGlobalGenerator()
cmGlobalGenerator::~cmGlobalGenerator()
{
this->ClearGeneratorMembers();
-
- if (this->ExtraGenerator)
- {
- delete this->ExtraGenerator;
- }
+ delete this->ExtraGenerator;
}
bool cmGlobalGenerator::SetGeneratorPlatform(std::string const& p,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c697c1fafef16f00e4ec6a72d12eb3a43c01879a
commit c697c1fafef16f00e4ec6a72d12eb3a43c01879a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 19:51:54 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:18:11 2015 +0100
cmTarget: Remove template argument workaround.
Pre-C++98 compilers required that the template argument be
used in the function parameters. Those compilers are no longer
supported as hosts, so drop the workaround.
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index e18250c..7bffa42 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -28,34 +28,6 @@ Some implementations have a ``std::auto_ptr`` which can not be used as a
return value from a function. ``std::auto_ptr`` may not be used. Use
``cmsys::auto_ptr`` instead.
-Template Parameter Defaults
----------------------------
-
-On ancient compilers, C++ template must use template parameters in function
-arguments. If no parameter of that type is needed, the common workaround is
-to add a defaulted pointer to the type to the templated function. However,
-this does not work with other ancient compilers:
-
-.. code-block:: c++
-
- template<typename PropertyType>
- PropertyType getTypedProperty(cmTarget* tgt, const char* prop,
- PropertyType* = 0) // Wrong
- {
-
- }
-
-.. code-block:: c++
-
- template<typename PropertyType>
- PropertyType getTypedProperty(cmTarget* tgt, const char* prop,
- PropertyType*) // Ok
- {
-
- }
-
-and invoke it with the value ``0`` explicitly in all cases.
-
size_t
------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 526a923..1ad0d48 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4711,13 +4711,11 @@ bool cmTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
//----------------------------------------------------------------------------
template<typename PropertyType>
-PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop,
- PropertyType *);
+PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop);
//----------------------------------------------------------------------------
template<>
-bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop,
- bool *)
+bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop)
{
return tgt->GetPropertyAsBool(prop);
}
@@ -4725,8 +4723,7 @@ bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop,
//----------------------------------------------------------------------------
template<>
const char *getTypedProperty<const char *>(cmTarget const* tgt,
- const std::string& prop,
- const char **)
+ const std::string& prop)
{
return tgt->GetProperty(prop);
}
@@ -4937,8 +4934,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
CompatibleType t,
PropertyType *)
{
- PropertyType propContent = getTypedProperty<PropertyType>(tgt, p,
- 0);
+ PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
const bool explicitlySet = tgt->GetProperties()
.find(p)
!= tgt->GetProperties().end();
@@ -4991,7 +4987,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
!= theTarget->GetProperties().end();
PropertyType ifacePropContent =
getTypedProperty<PropertyType>(theTarget,
- interfaceProperty, 0);
+ interfaceProperty);
std::string reportEntry;
if (ifaceIsSet)
-----------------------------------------------------------------------
Summary of changes:
Help/command/target_compile_definitions.rst | 2 +-
Help/manual/cmake-developer.7.rst | 28 ---------------------------
Source/CMakeLists.txt | 2 +-
Source/CTest/cmCTestBuildAndTestHandler.cxx | 3 +--
Source/cmAlgorithms.h | 7 +++----
Source/cmCoreTryCompile.cxx | 3 +--
Source/cmGeneratorExpressionEvaluator.cxx | 5 +----
Source/cmGlobalGenerator.cxx | 8 ++------
Source/cmListCommand.cxx | 12 ++++++------
Source/cmLocalGenerator.cxx | 7 +++----
Source/cmTarget.cxx | 14 +++++---------
Source/cmcmd.cxx | 4 ----
12 files changed, 24 insertions(+), 71 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list