[Cmake-commits] CMake branch, next, updated. v2.8.12-4246-gaad9908
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 aad9908dbe2af5d7307af6b0182afd187db3a20b (commit)
via e6cec64820e6b39d1e4878f5a1abb2576064d95b (commit)
via 07a2342fbc5cd2109b2024a04300086a66b37f3b (commit)
from 8cdf6ac28f5690957d7af9b05e86e77c6ef64e4b (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=aad9908dbe2af5d7307af6b0182afd187db3a20b
commit aad9908dbe2af5d7307af6b0182afd187db3a20b
Merge: 8cdf6ac e6cec64
Author: Daniele E. Domenichelli
AuthorDate: Tue Oct 22 02:50:13 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 22 02:50:13 2013 -0400
Merge topic 'CheckTypeSize_CXX' into next
e6cec64 CheckTypeSize: Add unit tests
07a2342 CheckTypeSize: Add support for C++
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6cec64820e6b39d1e4878f5a1abb2576064d95b
commit e6cec64820e6b39d1e4878f5a1abb2576064d95b
Author: Daniele E. Domenichelli
AuthorDate: Fri Oct 18 12:35:04 2013 +0200
Commit: Daniele E. Domenichelli
CommitDate: Mon Oct 21 16:39:04 2013 +0200
CheckTypeSize: Add unit tests
diff --git a/Tests/Module/CheckTypeSize/CMakeLists.txt
b/Tests/Module/CheckTypeSize/CMakeLists.txt
index abe617a..16989fe 100644
--- a/Tests/Module/CheckTypeSize/CMakeLists.txt
+++ b/Tests/Module/CheckTypeSize/CMakeLists.txt
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 2.8.1 FATAL_ERROR)
-project(CheckTypeSize C)
+project(CheckTypeSize)
+# Check C types
include(CheckTypeSize)
check_type_size("void*" SIZEOF_DATA_PTR)
check_type_size(charSIZEOF_CHAR)
@@ -18,7 +19,19 @@ check_type_size("((struct somestruct*)0)->someint"
SIZEOF_STRUCTMEMBER_INT)
check_type_size("((struct somestruct*)0)->someptr" SIZEOF_STRUCTMEMBER_PTR)
check_type_size("((struct somestruct*)0)->somechar" SIZEOF_STRUCTMEMBER_CHAR)
+# Check CXX types
+check_type_size(boolSIZEOF_BOOL LANGUAGE CXX)
+
+set(CMAKE_EXTRA_INCLUDE_FILES someclass.hxx)
+check_type_size("((ns::someclass*)0)->someint" SIZEOF_NS_CLASSMEMBER_INT
LANGUAGE CXX)
+check_type_size("((ns::someclass*)0)->someptr" SIZEOF_NS_CLASSMEMBER_PTR
LANGUAGE CXX)
+check_type_size("((ns::someclass*)0)->somechar" SIZEOF_NS_CLASSMEMBER_CHAR
LANGUAGE CXX)
+check_type_size("((ns::someclass*)0)->somebool" SIZEOF_NS_CLASSMEMBER_BOOL
LANGUAGE CXX)
+
configure_file(config.h.in config.h)
+configure_file(config.hxx.in config.hxx)
+
include_directories("${CheckTypeSize_BINARY_DIR}")
add_executable(CheckTypeSize CheckTypeSize.c)
+add_executable(CheckTypeSizeCXX CheckTypeSize.cxx)
diff --git a/Tests/Module/CheckTypeSize/CheckTypeSize.cxx
b/Tests/Module/CheckTypeSize/CheckTypeSize.cxx
new file mode 100644
index 000..b5692cd
--- /dev/null
+++ b/Tests/Module/CheckTypeSize/CheckTypeSize.cxx
@@ -0,0 +1,172 @@
+#include "config.h"
+#include "config.hxx"
+#include "someclass.hxx"
+
+#ifdef HAVE_SYS_TYPES_H
+# include
+#endif
+#ifdef HAVE_STDINT_H
+# include
+#endif
+#ifdef HAVE_STDDEF_H
+# include
+#endif
+
+#include
+
+#define CHECK(t,m) do { \
+ if(sizeof(t) != m)\
+{ \
+printf(#m ": expected %d, got %d (line %d)\n", \
+ (int)sizeof(t), (int)m, __LINE__); \
+result = 1; \
+} \
+ } while(0)
+
+#define NODEF(m) do { \
+ printf(#m": not defined (line %d)\n", __LINE__); \
+ result = 1; \
+ } while(0)
+
+int main()
+{
+ int result = 0;
+ ns::someclass y;
+
+ /* void* */
+#if !defined(HAVE_SIZEOF_DATA_PTR)
+ NODEF(HAVE_SIZEOF_DATA_PTR);
+#endif
+#if defined(SIZEOF_DATA_PTR)
+ CHECK(void*, SIZEOF_DATA_PTR);
+#else
+ NODEF(SIZEOF_DATA_PTR);
+#endif
+
+ /* char */
+#if !defined(HAVE_SIZEOF_CHAR)
+ NODEF(HAVE_SIZEOF_CHAR);
+#endif
+#if defined(SIZEOF_CHAR)
+ CHECK(char, SIZEOF_CHAR);
+#else
+ NODEF(SIZEOF_CHAR);
+#endif
+
+ /* short */
+#if !defined(HAVE_SIZEOF_SHORT)
+ NODEF(HAVE_SIZEOF_SHORT);
+#endif
+#if defined(SIZEOF_SHORT)
+ CHECK(short, SIZEOF_SHORT);
+#else
+ NODEF(SIZEOF_SHORT);
+#endif
+
+ /* int */
+#if !defined(HAVE_SIZEOF_INT)
+ NODEF(HAVE_SIZEOF_INT);
+#endif
+#if defined(SIZEOF_INT)
+ CHECK(int, SIZEOF_INT);
+#else
+ NODEF(SIZEOF_INT);
+#endif
+
+ /* long */
+#if !defined(HAVE_SIZEOF_LONG)
+ NODEF(HAVE_S
[Cmake-commits] CMake branch, master, updated. v2.8.12-384-ge71a5e3
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, master has been updated via e71a5e39826895af737b907f23b66412602a7f50 (commit) from bf02e750796c6b42b0e9d39ba322cd5191489a0e (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=e71a5e39826895af737b907f23b66412602a7f50 commit e71a5e39826895af737b907f23b66412602a7f50 Author: Kitware Robot AuthorDate: Tue Oct 22 00:01:09 2013 -0400 Commit: Kitware Robot CommitDate: Tue Oct 22 00:01:09 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a44f362..321066d 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 12) -set(CMake_VERSION_TWEAK 20131021) +set(CMake_VERSION_TWEAK 20131022) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4243-g8cdf6ac
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 8cdf6ac28f5690957d7af9b05e86e77c6ef64e4b (commit)
via 17f4f4013a2e58dae40e4c4320474be5da433d09 (commit)
via f5a82d68e50734734a78a92e6061dd8fe5cb1219 (commit)
via f5397959857709e4d429029aa68a13ec2b19e70a (commit)
from f0eb914254495717767db0e358f5ee51c512cbee (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=8cdf6ac28f5690957d7af9b05e86e77c6ef64e4b
commit 8cdf6ac28f5690957d7af9b05e86e77c6ef64e4b
Merge: f0eb914 17f4f40
Author: Stephen Kelly
AuthorDate: Mon Oct 21 19:19:34 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 19:19:34 2013 -0400
Merge topic 'cmarray-templates' into next
17f4f40 Genex: Use cmArraySize for targetPolicyWhitelist
f5a82d6 Genex: Remove use of TransitiveWhitelistCompare
f539795 Add some templates for cleaner array iteration.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17f4f4013a2e58dae40e4c4320474be5da433d09
commit 17f4f4013a2e58dae40e4c4320474be5da433d09
Author: Stephen Kelly
AuthorDate: Tue Oct 22 01:14:03 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue Oct 22 01:18:58 2013 +0200
Genex: Use cmArraySize for targetPolicyWhitelist
For better readability.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index bc873e0..d13d0dd 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1101,10 +1101,7 @@ static const struct TargetPolicyNode : public
cmGeneratorExpressionNode
context->HadContextSensitiveCondition = true;
-for (size_t i = 1;
- i < (sizeof(targetPolicyWhitelist) /
- sizeof(*targetPolicyWhitelist));
- ++i)
+for (size_t i = 1; i < cmArraySize(targetPolicyWhitelist); ++i)
{
const char *policy = targetPolicyWhitelist[i];
if (parameters.front() == policy)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5a82d68e50734734a78a92e6061dd8fe5cb1219
commit f5a82d68e50734734a78a92e6061dd8fe5cb1219
Author: Stephen Kelly
AuthorDate: Tue Oct 22 01:12:24 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue Oct 22 01:18:45 2013 +0200
Genex: Remove use of TransitiveWhitelistCompare
Replace with generic solution based on cmArray* for better
readability.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 7fd0fdc..bc873e0 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -704,17 +704,6 @@ std::string getLinkedTargetsContent(const
std::vector &libraries,
}
//
-struct TransitiveWhitelistCompare
-{
- explicit TransitiveWhitelistCompare(const std::string &needle)
-: Needle(needle) {}
- bool operator() (const char *item)
- { return strcmp(item, this->Needle.c_str()) == 0; }
-private:
- std::string Needle;
-};
-
-//
static const struct TargetPropertyNode : public cmGeneratorExpressionNode
{
TargetPropertyNode() {}
@@ -864,8 +853,7 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
return std::string();
case cmGeneratorExpressionDAGChecker::ALREADY_SEEN:
for (size_t i = 1;
- i < (sizeof(targetPropertyTransitiveWhitelist) /
-sizeof(*targetPropertyTransitiveWhitelist));
+ i < cmArraySize(targetPropertyTransitiveWhitelist);
++i)
{
if (targetPropertyTransitiveWhitelist[i] == propertyName)
@@ -928,12 +916,13 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
cmTarget *headTarget = context->HeadTarget ? context->HeadTarget : target;
-const char **transBegin = targetPropertyTransitiveWhitelist + 1;
-const char **transEnd = targetPropertyTransitiveWhitelist
- + (sizeof(targetPropertyTransitiveWhitelist) /
- sizeof(*targetPropertyTransitiveWhitelist));
+const char * const *transBegin =
+cmArrayBegin(targetPropertyTransitiveWhitelist) + 1;
+const char * const *transEnd =
+cmArrayEnd(targetPropertyTransitiveWhitelist);
+
if (std::find_if(transBegin, transEnd,
- TransitiveWhitelistCompare(propertyName)) != transEnd)
+ cmStrCmp(propertyName)) != transEnd)
{
std::vector libs;
@@ -949,7 +938,7 @@ static const struct Tar
[Cmake-commits] CMake branch, next, updated. v2.8.12-4239-gf0eb914
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 f0eb914254495717767db0e358f5ee51c512cbee (commit)
via 2d0287dd5e12f57085d01badc9c0696924b61d94 (commit)
via 7b9ae406f3f2fbe4de9d075a50ec0daae4fa1274 (commit)
from 06db1883b8631f8b5ce86ab75249ca146dcfde07 (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=f0eb914254495717767db0e358f5ee51c512cbee
commit f0eb914254495717767db0e358f5ee51c512cbee
Merge: 06db188 2d0287d
Author: Brad King
AuthorDate: Mon Oct 21 15:47:06 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 15:47:06 2013 -0400
Merge topic 'rst-literal-blocks' into next
2d0287d cmRST: Process literal blocks after paragraphs ending in '::'
7b9ae40 cmRST: Do not process inline markup in code-block literals
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d0287dd5e12f57085d01badc9c0696924b61d94
commit 2d0287dd5e12f57085d01badc9c0696924b61d94
Author: Brad King
AuthorDate: Mon Oct 21 15:31:44 2013 -0400
Commit: Brad King
CommitDate: Mon Oct 21 15:40:26 2013 -0400
cmRST: Process literal blocks after paragraphs ending in '::'
Teach cmRST to recognize non-markup lines ending in '::' followed by a
blank line as starting a literal block. Record the whole block as if it
were a literal block directive and print it just like a code block.
Extend the CMakeLib.testRST test to cover such cases.
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index b64887d..d2eeb0c 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -22,6 +22,7 @@ cmRST::cmRST(std::ostream& os, std::string const& docroot):
DocRoot(docroot),
IncludeDepth(0),
OutputLinePending(false),
+ LastLineEndedInColonColon(false),
Markup(MarkupNone),
Directive(DirectiveNone),
CMakeDirective("^.. (cmake:)?("
@@ -125,6 +126,7 @@ void cmRST::Reset()
{
case DirectiveNone: break;
case DirectiveParsedLiteral: this->ProcessDirectiveParsedLiteral(); break;
+case DirectiveLiteralBlock: this->ProcessDirectiveLiteralBlock(); break;
case DirectiveCodeBlock: this->ProcessDirectiveCodeBlock(); break;
case DirectiveReplace: this->ProcessDirectiveReplace(); break;
case DirectiveTocTree: this->ProcessDirectiveTocTree(); break;
@@ -137,6 +139,9 @@ void cmRST::Reset()
//
void cmRST::ProcessLine(std::string const& line)
{
+ bool lastLineEndedInColonColon = this->LastLineEndedInColonColon;
+ this->LastLineEndedInColonColon = false;
+
// A line starting in .. is an explicit markup start.
if(line == ".." || (line.size() >= 3 && line[0] == '.' &&
line[1] == '.' && isspace(line[2])))
@@ -211,10 +216,21 @@ void cmRST::ProcessLine(std::string const& line)
this->MarkupLines.push_back(line);
}
}
+ // A blank line following a paragraph ending in "::" starts a literal block.
+ else if(lastLineEndedInColonColon && line.empty())
+{
+// Record the literal lines to output after whole block.
+this->Markup = MarkupNormal;
+this->Directive = DirectiveLiteralBlock;
+this->MarkupLines.push_back("");
+this->OutputLine("", false);
+}
// Print non-markup lines.
else
{
this->NormalLine(line);
+this->LastLineEndedInColonColon = (line.size() >= 2
+ && line[line.size()-2] == ':' && line[line.size()-1] == ':');
}
}
@@ -344,6 +360,12 @@ void cmRST::ProcessDirectiveParsedLiteral()
}
//
+void cmRST::ProcessDirectiveLiteralBlock()
+{
+ this->OutputMarkupLines(false);
+}
+
+//
void cmRST::ProcessDirectiveCodeBlock()
{
this->OutputMarkupLines(false);
diff --git a/Source/cmRST.h b/Source/cmRST.h
index a3b9c32..faae25f 100644
--- a/Source/cmRST.h
+++ b/Source/cmRST.h
@@ -38,6 +38,7 @@ private:
{
DirectiveNone,
DirectiveParsedLiteral,
+DirectiveLiteralBlock,
DirectiveCodeBlock,
DirectiveReplace,
DirectiveTocTree
@@ -53,6 +54,7 @@ private:
void OutputMarkupLines(bool inlineMarkup);
bool ProcessInclude(std::string file, IncludeType type);
void ProcessDirectiveParsedLiteral();
+ void ProcessDirectiveLiteralBlock();
void ProcessDirectiveCodeBlock();
void ProcessDirectiveReplace();
void ProcessDirectiveTocTree();
@@ -62,6 +64,7 @@ private:
std::string DocRoot;
int IncludeDepth;
bool OutputLinePending;
+ bool LastLineEndedInColonColon;
MarkupType Markup;
Directiv
[Cmake-commits] CMake branch, next, updated. v2.8.12-4236-g06db188
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 06db1883b8631f8b5ce86ab75249ca146dcfde07 (commit)
via a80fe4b1d24dff993442a45e63948eeb9e6a3962 (commit)
from 0acb875e9f10337ca0cf2b5186b8f87e07094b64 (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=06db1883b8631f8b5ce86ab75249ca146dcfde07
commit 06db1883b8631f8b5ce86ab75249ca146dcfde07
Merge: 0acb875 a80fe4b
Author: Rolf Eike Beer
AuthorDate: Mon Oct 21 14:45:58 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 14:45:58 2013 -0400
Merge topic 'genex-conversion-warnings' into next
a80fe4b use size_t for GeneratorExpressionContent::ContentLength to fix
some warnings
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a80fe4b1d24dff993442a45e63948eeb9e6a3962
commit a80fe4b1d24dff993442a45e63948eeb9e6a3962
Author: Rolf Eike Beer
AuthorDate: Mon Oct 21 19:18:16 2013 +0200
Commit: Rolf Eike Beer
CommitDate: Mon Oct 21 19:58:49 2013 +0200
use size_t for GeneratorExpressionContent::ContentLength to fix some
warnings
CMake/Source/cmGeneratorExpressionParser.cxx: In member function ‘void
cmGeneratorExpressionParser::ParseGeneratorExpression(std::vector&)’:
CMake/Source/cmGeneratorExpressionParser.cxx:116:55: warning: conversion to
‘unsigned int’ from ‘long int’ may alter its value [-Wconversion]
CMake/Source/cmGeneratorExpressionParser.cxx:240:39: warning: conversion to
‘int’ from ‘long int’ may alter its value [-Wconversion]
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 7fd0fdc..dfd995e 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1446,7 +1446,7 @@ cmGeneratorExpressionNode* GetNode(const std::string
&identifier)
//
GeneratorExpressionContent::GeneratorExpressionContent(
const char *startContent,
-unsigned int length)
+size_t length)
: StartContent(startContent), ContentLength(length)
{
diff --git a/Source/cmGeneratorExpressionEvaluator.h
b/Source/cmGeneratorExpressionEvaluator.h
index 218abf1..343e18b 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -63,7 +63,7 @@ private:
struct TextContent : public cmGeneratorExpressionEvaluator
{
- TextContent(const char *start, unsigned int length)
+ TextContent(const char *start, size_t length)
: Content(start), Length(length)
{
@@ -80,25 +80,25 @@ struct TextContent : public cmGeneratorExpressionEvaluator
return cmGeneratorExpressionEvaluator::Text;
}
- void Extend(unsigned int length)
+ void Extend(size_t length)
{
this->Length += length;
}
- unsigned int GetLength()
+ size_t GetLength()
{
return this->Length;
}
private:
const char *Content;
- unsigned int Length;
+ size_t Length;
};
//
struct GeneratorExpressionContent : public cmGeneratorExpressionEvaluator
{
- GeneratorExpressionContent(const char *startContent, unsigned int length);
+ GeneratorExpressionContent(const char *startContent, size_t length);
void SetIdentifier(std::vector identifier)
{
this->IdentifierChildren = identifier;
@@ -141,7 +141,7 @@ private:
std::vector IdentifierChildren;
std::vector > ParamChildren;
const char *StartContent;
- unsigned int ContentLength;
+ size_t ContentLength;
};
#endif
diff --git a/Source/cmGeneratorExpressionLexer.h
b/Source/cmGeneratorExpressionLexer.h
index 5f16712..83d661d 100644
--- a/Source/cmGeneratorExpressionLexer.h
+++ b/Source/cmGeneratorExpressionLexer.h
@@ -19,7 +19,7 @@
//
struct cmGeneratorExpressionToken
{
- cmGeneratorExpressionToken(unsigned type, const char *c, unsigned l)
+ cmGeneratorExpressionToken(unsigned type, const char *c, size_t l)
: TokenType(type), Content(c), Length(l)
{
}
@@ -32,7 +32,7 @@ struct cmGeneratorExpressionToken
};
unsigned TokenType;
const char *Content;
- unsigned Length;
+ size_t Length;
};
/** \class cmGeneratorExpressionLexer
diff --git a/Source/cmGeneratorExpressionParser.cxx
b/Source/cmGeneratorExpressionParser.cxx
index e1fb8f1..a41a6e5 100644
--- a/Source/cmGeneratorExpressionParser.cxx
+++ b/Source/cmGenerato
[Cmake-commits] CMake branch, next, updated. v2.8.12-4234-g0acb875
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 0acb875e9f10337ca0cf2b5186b8f87e07094b64 (commit)
via 4e184a21beda9de3703ecda94085c234f5bbd7da (commit)
from 1c469b1b9577f62c420fcf8182f66bda8fd776b3 (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=0acb875e9f10337ca0cf2b5186b8f87e07094b64
commit 0acb875e9f10337ca0cf2b5186b8f87e07094b64
Merge: 1c469b1 4e184a2
Author: Brad King
AuthorDate: Mon Oct 21 12:55:39 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 12:55:39 2013 -0400
Merge topic 'string-CONCAT-command' into next
4e184a2 string: Add CONCAT sub-command
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e184a21beda9de3703ecda94085c234f5bbd7da
commit 4e184a21beda9de3703ecda94085c234f5bbd7da
Author: Brad King
AuthorDate: Mon Oct 21 12:49:15 2013 -0400
Commit: Brad King
CommitDate: Mon Oct 21 12:54:20 2013 -0400
string: Add CONCAT sub-command
Add a string(CONCAT) command to simply concatenate input arguments
together. This will be useful for combining strings from different
quoting syntaxes. Add a RunCMake.string test covering these cases.
diff --git a/Help/command/string.rst b/Help/command/string.rst
index 1e18ca6..af18825 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -15,6 +15,7 @@ String operations.
string(REPLACE
[...])
+ string(CONCAT [...])
string(
)
string(COMPARE EQUAL )
@@ -51,6 +52,9 @@ through argument parsing.
REPLACE will replace all occurrences of match_string in the input with
replace_string and store the result in the output.
+CONCAT will concatenate all the input arguments together and store
+the result in the named output variable.
+
MD5, SHA1, SHA224, SHA256, SHA384, and SHA512 will compute a
cryptographic hash of the input string.
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 68ba13f..f9b69e3 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -73,6 +73,10 @@ bool cmStringCommand
{
return this->HandleLengthCommand(args);
}
+ else if(subCommand == "CONCAT")
+{
+return this->HandleConcatCommand(args);
+}
else if(subCommand == "SUBSTRING")
{
return this->HandleSubstringCommand(args);
@@ -768,6 +772,27 @@ bool cmStringCommand
//
bool cmStringCommand
+::HandleConcatCommand(std::vector const& args)
+{
+ if(args.size() < 2)
+{
+this->SetError("sub-command CONCAT requires at least one argument.");
+return false;
+}
+
+ std::string const& variableName = args[1];
+ std::string value;
+ for(unsigned int i = 2; i < args.size(); ++i)
+{
+value += args[i];
+}
+
+ this->Makefile->AddDefinition(variableName.c_str(), value.c_str());
+ return true;
+}
+
+//
+bool cmStringCommand
::HandleMakeCIdentifierCommand(std::vector const& args)
{
if(args.size() != 3)
diff --git a/Source/cmStringCommand.h b/Source/cmStringCommand.h
index 0e833c4..66b48e6 100644
--- a/Source/cmStringCommand.h
+++ b/Source/cmStringCommand.h
@@ -69,6 +69,7 @@ protected:
bool HandleReplaceCommand(std::vector const& args);
bool HandleLengthCommand(std::vector const& args);
bool HandleSubstringCommand(std::vector const& args);
+ bool HandleConcatCommand(std::vector const& args);
bool HandleStripCommand(std::vector const& args);
bool HandleRandomCommand(std::vector const& args);
bool HandleFindCommand(std::vector const& args);
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 52c8667..44da6f2 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -98,6 +98,7 @@ add_RunCMake_test(include)
add_RunCMake_test(include_directories)
add_RunCMake_test(list)
add_RunCMake_test(message)
+add_RunCMake_test(string)
add_RunCMake_test(try_compile)
add_RunCMake_test(variable_watch)
add_RunCMake_test(CMP0004)
diff --git a/Tests/RunCMake/string/CMakeLists.txt
b/Tests/RunCMake/string/CMakeLists.txt
new file mode 100644
index 000..12cd3c7
--- /dev/null
+++ b/Tests/RunCMake/string/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/string/Concat.cmake
b/Tests/RunCMake/string/Concat.cmake
new file mode 100644
index 000..7260c95
--- /dev/null
+++ b/Tests/RunCMake/string/Concat.cmake
@@ -0,0 +1,19 @@
+set(b b)
+set(ou
[Cmake-commits] CMake branch, next, updated. v2.8.12-4232-g1c469b1
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 1c469b1b9577f62c420fcf8182f66bda8fd776b3 (commit)
via e5ec8ad47dc07623b6318bb413e01cc921cf66c4 (commit)
from 979831aee6b68b8c9a39e1f70797637002dd8a73 (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=1c469b1b9577f62c420fcf8182f66bda8fd776b3
commit 1c469b1b9577f62c420fcf8182f66bda8fd776b3
Merge: 979831a e5ec8ad
Author: Brad King
AuthorDate: Mon Oct 21 11:31:15 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 11:31:15 2013 -0400
Merge topic 'xcode-folder-types' into next
e5ec8ad Xcode: Generate 'folder' source type for directories (#14498)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5ec8ad47dc07623b6318bb413e01cc921cf66c4
commit e5ec8ad47dc07623b6318bb413e01cc921cf66c4
Author: Michael Priestman
AuthorDate: Mon Oct 21 15:46:25 2013 +0100
Commit: Brad King
CommitDate: Mon Oct 21 11:09:59 2013 -0400
Xcode: Generate 'folder' source type for directories (#14498)
Teach the Xcode generator to set 'lastKnownFileType' to be 'folder' for
file references that are directories. If you set 'explicitFileType' to
'sourcecode', then Xcode cannot browse the directory.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index c8b6832..13ed143 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -876,10 +876,20 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
ext = realExt.substr(1);
}
- std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang);
-
- fileRef->AddAttribute("explicitFileType",
-this->CreateString(sourcecode.c_str()));
+ // If fullpath references a directory, then we need to specify
+ // lastKnownFileType as folder in order for Xcode to be able to open the
+ // contents of the folder (Xcode 4.6 does not like explicitFileType=folder).
+ if(cmSystemTools::FileIsDirectory(fullpath.c_str()))
+{
+fileRef->AddAttribute("lastKnownFileType",
+ this->CreateString("folder"));
+}
+ else
+{
+std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang);
+fileRef->AddAttribute("explicitFileType",
+ this->CreateString(sourcecode.c_str()));
+}
// Store the file path relative to the top of the source tree.
std::string path = this->RelativeToSource(fullpath.c_str());
@@ -1009,7 +1019,8 @@
cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
cmTarget::SourceFileFlags tsFlags =
cmtarget.GetTargetSourceFileFlags(*i);
- if(strcmp(filetype->GetString(), "compiled.mach-o.objfile") == 0)
+ if(filetype &&
+ strcmp(filetype->GetString(), "compiled.mach-o.objfile") == 0)
{
externalObjFiles.push_back(xsf);
}
---
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 21 -
1 files changed, 16 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4230-g979831a
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 979831aee6b68b8c9a39e1f70797637002dd8a73 (commit)
via 0698714c86fdb187caf5df336fb7e3c005271872 (commit)
from ef9d8b9089d3d7f5519267c5fe13cfe21e874211 (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=979831aee6b68b8c9a39e1f70797637002dd8a73
commit 979831aee6b68b8c9a39e1f70797637002dd8a73
Merge: ef9d8b9 0698714
Author: Brad King
AuthorDate: Mon Oct 21 10:38:27 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 10:38:27 2013 -0400
Merge topic 'vs9-target-framework-version' into next
0698714 VS: Set .NET target framework version for VS 7-9 (#14499)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0698714c86fdb187caf5df336fb7e3c005271872
commit 0698714c86fdb187caf5df336fb7e3c005271872
Author: Brad King
AuthorDate: Mon Oct 21 09:35:09 2013 -0400
Commit: Brad King
CommitDate: Mon Oct 21 09:35:09 2013 -0400
VS: Set .NET target framework version for VS 7-9 (#14499)
Teach the VS 7-9 generators to honor the
VS_DOTNET_TARGET_FRAMEWORK_VERSION
target property. This was already done for VS >= 10 by commit cfe6300a
(VS: Add support for .NET target framework version, 2013-06-14).
Inspired-by: mar...@t-online.de
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index f21abc3..30c3d73 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2050,6 +2050,11 @@
cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
fout << "\tProjectGUID=\"{" << gg->GetGUID(libName) << "}\"\n";
}
this->WriteProjectSCC(fout, target);
+ if(const char* targetFrameworkVersion =
+ target.GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
+{
+fout << "\tTargetFrameworkVersion=\"" << targetFrameworkVersion << "\"\n";
+}
fout << "\tKeyword=\"" << keyword << "\">\n"
<< "\t\n"
<< "\t\tPlatformName << "\"/>\n"
---
Summary of changes:
Source/cmLocalVisualStudio7Generator.cxx |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4228-gef9d8b9
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 ef9d8b9089d3d7f5519267c5fe13cfe21e874211 (commit)
via bcd5de775a412881e28c4c58f1d6ce535135e97f (commit)
from 6a63987afb4985e814dece75836c724ef7eaae3f (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=ef9d8b9089d3d7f5519267c5fe13cfe21e874211
commit ef9d8b9089d3d7f5519267c5fe13cfe21e874211
Merge: 6a63987 bcd5de7
Author: Brad King
AuthorDate: Mon Oct 21 10:35:16 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 10:35:16 2013 -0400
Merge topic 'cmake--build-pipes' into next
bcd5de7 cmake: Always pass through stdout/stderr in --build mode
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcd5de775a412881e28c4c58f1d6ce535135e97f
commit bcd5de775a412881e28c4c58f1d6ce535135e97f
Author: Brad King
AuthorDate: Fri Oct 18 13:38:36 2013 -0400
Commit: Brad King
CommitDate: Fri Oct 18 13:45:27 2013 -0400
cmake: Always pass through stdout/stderr in --build mode
Enable the --use-stderr behavior by default and ignore the old option.
Passing through the pipes allows color terminal output and other things
to work as if one ran the native build command directly.
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 64d0fb3..e8b98bd 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -64,10 +64,7 @@ native tool on their platform.
--config = For multi-configuration tools, choose .
--clean-first = Build target 'clean' first, then build.
(To clean only, use --target 'clean'.)
---use-stderr = Don't merge stdout/stderr output and pass the
- original stdout/stderr handles to the native
- tool so it can use the capabilities of the
- calling terminal (e.g. colored output).
+--use-stderr = Ignored. Behavior is default in CMake >= 3.0.
-- = Pass remaining options to the native tool.
Run cmake --build with no options for quick help.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index d11a40b..dc3a168 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2875,8 +2875,7 @@ int cmake::Build(const std::string& dir,
const std::string& target,
const std::string& config,
const std::vector& nativeOptions,
- bool clean,
- cmSystemTools::OutputOption outputflag)
+ bool clean)
{
if(!cmSystemTools::FileIsDirectory(dir.c_str()))
{
@@ -2918,7 +2917,8 @@ int cmake::Build(const std::string& dir,
projName.c_str(), target.c_str(),
&output,
makeProgram.c_str(),
-config.c_str(), clean, false, 0, outputflag,
+config.c_str(), clean, false, 0,
+cmSystemTools::OUTPUT_PASSTHROUGH,
0, nativeOptions);
}
diff --git a/Source/cmake.h b/Source/cmake.h
index 73e5109..7fe130b 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -362,8 +362,7 @@ class cmake
const std::string& target,
const std::string& config,
const std::vector& nativeOptions,
-bool clean,
-cmSystemTools::OutputOption outputflag);
+bool clean);
void UnwatchUnusedCli(const char* var);
void WatchUnusedCli(const char* var);
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 5113a75..77b6ce8 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -50,10 +50,7 @@ static const char * cmDocumentationUsage[][2] =
" --config = For multi-configuration tools, choose .\n" \
" --clean-first = Build target 'clean' first, then build.\n"\
" (To clean only, use --target 'clean'.)\n" \
- " --use-stderr = Don't merge stdout/stderr output and pass the\n" \
- " original stdout/stderr handles to the native\n" \
- " tool so it can use the capabilities of the\n" \
- " calling terminal (e.g. colored output).\n"\
+ " --use-stderr = Ignored. Behavior is default in CMake >= 3.0.\n" \
" -- = Pass remaining options to the native tool.\n"
//
@@ -372,7 +369,6 @@ static int do_build(int ac, char** av)
std::string dir;
std::vector nativeOptions;
bool clean = false;
- cmSystemTools::OutputOption outputflag = cmSystemTools::OUTPUT_MERGE;
enum Doing { DoingNone,
[Cmake-commits] CMake branch, next, updated. v2.8.12-4226-g6a63987
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 6a63987afb4985e814dece75836c724ef7eaae3f (commit)
via a8226e91d75e595248a176966f3f645203f12072 (commit)
from 6aa1225938ede14f55dd97342ab1fe3e65a1fc47 (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=6a63987afb4985e814dece75836c724ef7eaae3f
commit 6a63987afb4985e814dece75836c724ef7eaae3f
Merge: 6aa1225 a8226e9
Author: Brad King
AuthorDate: Mon Oct 21 10:27:18 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 10:27:18 2013 -0400
Merge topic 'remove-cmake-i-wizard' into next
a8226e9 cmake: Drop support for "-i" wizard mode
diff --cc Help/manual/cmake.1.rst
index d026c63,46190b5..2ee9bcc
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@@ -33,15 -33,9 +33,9 @@@ native tool on their platform
copy_directory, copy_if_different, echo, echo_append, environment,
make_directory, md5sum, remove, remove_directory, rename, tar, time,
touch, touch_nocreate. In addition, some platform specific commands
- are available. On Windows: comspec, delete_regv, write_regv. On
+ are available. On Windows: delete_regv, write_regv. On
UNIX: create_symlink.
- * ``-i``: Run in wizard mode.
-
- Wizard mode runs cmake interactively without a GUI. The user is
- prompted to answer questions about the project configuration. The
- answers are used to set cmake cache values.
-
* ``-L[A][H]``: List non-advanced cached variables.
List cache variables will run CMake and list all the variables from
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8226e91d75e595248a176966f3f645203f12072
commit a8226e91d75e595248a176966f3f645203f12072
Author: Brad King
AuthorDate: Fri Oct 18 13:30:43 2013 -0400
Commit: Brad King
CommitDate: Fri Oct 18 13:32:39 2013 -0400
cmake: Drop support for "-i" wizard mode
Tell users to pass cache values with the -D option on the command line
or use cmake-gui or ccmake.
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 64d0fb3..46190b5 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -36,12 +36,6 @@ native tool on their platform.
are available. On Windows: comspec, delete_regv, write_regv. On
UNIX: create_symlink.
-* ``-i``: Run in wizard mode.
-
- Wizard mode runs cmake interactively without a GUI. The user is
- prompted to answer questions about the project configuration. The
- answers are used to set cmake cache values.
-
* ``-L[A][H]``: List non-advanced cached variables.
List cache variables will run CMake and list all the variables from
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 71fae58..288e867 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -281,8 +281,6 @@ set(SRCS
cmXMLSafe.h
cmake.cxx
cmake.h
- cmakewizard.cxx
- cmakewizard.h
cm_sha2.h
cm_sha2.c
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 2eb440a..4b8c07d 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -179,7 +179,6 @@ private:
// the commands should never use the cmCacheManager directly
friend class cmMakefile; // allow access to add cache values
friend class cmake; // allow access to add cache values
- friend class cmakewizard; // allow access to add cache values
friend class cmMarkAsAdvancedCommand; // allow access to add cache values
};
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 5113a75..e86c2cf 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -20,7 +20,6 @@
#include "cmcmd.h"
#include "cmCacheManager.h"
#include "cmListFileCache.h"
-#include "cmakewizard.h"
#include "cmSourceFile.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
@@ -61,7 +60,6 @@ static const char * cmDocumentationOptions[][2] =
{
CMAKE_STANDARD_OPTIONS_TABLE,
{"-E", "CMake command mode."},
- {"-i", "Run in wizard mode."},
{"-L[A][H]", "List non-advanced cached variables."},
{"--build ", "Build a CMake-generated project binary tree."},
{"-N", "View mode only."},
@@ -236,7 +234,6 @@ int do_cmake(int ac, char** av)
}
#endif
- bool wiz = false;
bool sysinfo = false;
bool list_cached = false;
bool list_all_cached = false;
@@ -248,7 +245,11 @@ int do_cmake(int ac, char** av)
{
if(strcmp(av[i], "-i") == 0)
{
- wiz = true;
+ std::cerr <<
+"The \"cmake -i\" wizard mode is no longer supported.\n"
+"Use the -D option to set cache values on the command line.\n"
+"Use cmake-gui or ccmake for an interactiv
[Cmake-commits] CMake branch, next, updated. v2.8.12-4224-g6aa1225
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 6aa1225938ede14f55dd97342ab1fe3e65a1fc47 (commit) via b9fe4b6318905ff7ccea4f66aece6bb54688777c (commit) from 4a074c3adc4b54f570d6f0fb636cbdd717fd5a98 (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=6aa1225938ede14f55dd97342ab1fe3e65a1fc47 commit 6aa1225938ede14f55dd97342ab1fe3e65a1fc47 Merge: 4a074c3 b9fe4b6 Author: Brad King AuthorDate: Mon Oct 21 10:22:32 2013 -0400 Commit: CMake Topic Stage CommitDate: Mon Oct 21 10:22:32 2013 -0400 Merge topic 'doc-vs-keyword-properties' into next b9fe4b6 VS: Document VS_GLOBAL_KEYWORD and VS_KEYWORD relationship (#14493) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9fe4b6318905ff7ccea4f66aece6bb54688777c commit b9fe4b6318905ff7ccea4f66aece6bb54688777c Author: Brad King AuthorDate: Mon Oct 21 10:07:46 2013 -0400 Commit: Brad King CommitDate: Mon Oct 21 10:07:46 2013 -0400 VS: Document VS_GLOBAL_KEYWORD and VS_KEYWORD relationship (#14493) These two target properties serve the same purpose for different versions of Visual Studio. Document the versions covered by each property. Reported-by: mar...@t-online.de diff --git a/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst b/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst index 072475f..ce49316 100644 --- a/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst +++ b/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst @@ -1,9 +1,12 @@ VS_GLOBAL_KEYWORD - -Visual Studio project keyword. +Visual Studio project keyword for VS 10 (2010) and newer. Sets the "keyword" attribute for a generated Visual Studio project. Defaults to "Win32Proj". You may wish to override this value with "ManagedCProj", for example, in a Visual Studio managed C++ unit test project. + +Use the :prop_tgt:`VS_KEYWORD` target property to set the +keyword for Visual Studio 9 (2008) and older. diff --git a/Help/prop_tgt/VS_KEYWORD.rst b/Help/prop_tgt/VS_KEYWORD.rst index aa8e206..6c2e042 100644 --- a/Help/prop_tgt/VS_KEYWORD.rst +++ b/Help/prop_tgt/VS_KEYWORD.rst @@ -1,7 +1,10 @@ VS_KEYWORD -- -Visual Studio project keyword. +Visual Studio project keyword for VS 9 (2008) and older. Can be set to change the visual studio keyword, for example Qt integration works better if this is set to Qt4VSv1.0. + +Use the :prop_tgt:`VS_GLOBAL_KEYWORD` target property to set the +keyword for Visual Studio 10 (2010) and newer. --- Summary of changes: Help/prop_tgt/VS_GLOBAL_KEYWORD.rst |5 - Help/prop_tgt/VS_KEYWORD.rst|5 - 2 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4222-g4a074c3
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 4a074c3adc4b54f570d6f0fb636cbdd717fd5a98 (commit)
via 2086ff16fdb96603d5f8262798f4d02f00db4983 (commit)
from ed9516ebb09a6f7bab0e7f32e5f153d54fcba760 (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=4a074c3adc4b54f570d6f0fb636cbdd717fd5a98
commit 4a074c3adc4b54f570d6f0fb636cbdd717fd5a98
Merge: ed9516e 2086ff1
Author: Peter Kuemmel
AuthorDate: Mon Oct 21 10:16:53 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 10:16:53 2013 -0400
Merge topic 'ninja-remove-cmcldeps-2' into next
2086ff1 Revert "Ninja: use deps = gcc/msvc feature"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2086ff16fdb96603d5f8262798f4d02f00db4983
commit 2086ff16fdb96603d5f8262798f4d02f00db4983
Author: Peter Kümmel
AuthorDate: Mon Oct 21 16:15:45 2013 +0200
Commit: Peter Kümmel
CommitDate: Mon Oct 21 16:15:45 2013 +0200
Revert "Ninja: use deps = gcc/msvc feature"
This reverts commit e66df7ee65a8516ee829d3b63d6ea57e3e9ced87.
forgot to save header
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index 804cce2..3e8d4ff 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -55,4 +55,4 @@ set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES
"@CMAKE_C_IMPLICIT_LINK_DIRECTORIES@")
set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
"@CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@")
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
-@SET_CMAKE_CL_SHOWINCLUDES_PREFIX@
+@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
diff --git a/Modules/CMakeCXXCompiler.cmake.in
b/Modules/CMakeCXXCompiler.cmake.in
index 35aa6c4..777f007 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -56,4 +56,4 @@ set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
"@CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES@")
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
"@CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@")
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
-@SET_CMAKE_CL_SHOWINCLUDES_PREFIX@
+@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
diff --git a/Modules/CMakeClDeps.cmake b/Modules/CMakeClDeps.cmake
index b46e7c2..0214ead 100644
--- a/Modules/CMakeClDeps.cmake
+++ b/Modules/CMakeClDeps.cmake
@@ -20,7 +20,7 @@
# in front of each include path, so it can remove it.
#
-if(CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_C_COMPILER AND CMAKE_COMMAND)
+if(MSVC_C_ARCHITECTURE_ID AND CMAKE_GENERATOR MATCHES "Ninja" AND
CMAKE_C_COMPILER AND CMAKE_COMMAND)
string(REPLACE "cmake.exe" "cmcldeps.exe" CMAKE_CMCLDEPS_EXECUTABLE
${CMAKE_COMMAND})
set(showdir ${CMAKE_BINARY_DIR}/CMakeFiles/ShowIncludes)
file(WRITE ${showdir}/foo.h "\n")
@@ -30,5 +30,5 @@ if(CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_C_COMPILER AND
CMAKE_COMMAND)
string(REGEX MATCH "\n([^:]*:[^:]*:[ \t]*)" tmp "${outLine}")
set(localizedPrefix "${CMAKE_MATCH_1}")
set(SET_CMAKE_CMCLDEPS_EXECUTABLE "set(CMAKE_CMCLDEPS_EXECUTABLE
\"${CMAKE_CMCLDEPS_EXECUTABLE}\")")
- set(SET_CMAKE_CL_SHOWINCLUDES_PREFIX "set(CMAKE_CL_SHOWINCLUDES_PREFIX
\"${localizedPrefix}\")")
+ set(SET_CMAKE_CL_SHOWINCLUDE_PREFIX "set(CMAKE_CL_SHOWINCLUDE_PREFIX
\"${localizedPrefix}\")")
endif()
diff --git a/Modules/CMakeDetermineCCompiler.cmake
b/Modules/CMakeDetermineCCompiler.cmake
index ce0978c..8769c66 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -176,13 +176,12 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
endif ()
+include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_C_ARCHITECTURE_ID)
- include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_C_ARCHITECTURE_ID
"set(MSVC_C_ARCHITECTURE_ID ${MSVC_C_ARCHITECTURE_ID})")
endif()
-
# configure variables set in this file for fast reload later on
configure_file(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in
${CMAKE_PLATFORM_INFO_DIR}/CMakeCCompiler.cmake
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake
b/Modules/CMakeDetermineCXXCompiler.cmake
index d821dcc..c79ba89 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -175,13 +175,12 @@ if (CMAKE_CROSSCOMPILING AND NOT
_CMAKE_TOOLCHAIN_PREFIX)
endif ()
+include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_CXX_ARCHITECTURE_ID)
- include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_CXX_ARCHITECTURE_ID
"set(MSVC_CXX_ARCHITECTURE_ID ${MSVC_CXX_ARCHITECTURE_ID})")
endif()
-
# configure all variables set in this file
configure_file(${CMAKE_ROOT}/Module
[Cmake-commits] CMake branch, next, updated. v2.8.12-4220-ged9516e
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 ed9516ebb09a6f7bab0e7f32e5f153d54fcba760 (commit)
via e66df7ee65a8516ee829d3b63d6ea57e3e9ced87 (commit)
from 400e9b26e55ff96dd5b86d9127ca077e1d444862 (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=ed9516ebb09a6f7bab0e7f32e5f153d54fcba760
commit ed9516ebb09a6f7bab0e7f32e5f153d54fcba760
Merge: 400e9b2 e66df7e
Author: Peter Kuemmel
AuthorDate: Mon Oct 21 09:59:31 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 09:59:31 2013 -0400
Merge topic 'ninja-remove-cmcldeps-2' into next
e66df7e Ninja: use deps = gcc/msvc feature
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e66df7ee65a8516ee829d3b63d6ea57e3e9ced87
commit e66df7ee65a8516ee829d3b63d6ea57e3e9ced87
Author: Peter Kümmel
AuthorDate: Fri Oct 18 12:59:47 2013 +0200
Commit: Peter Kümmel
CommitDate: Mon Oct 21 15:58:05 2013 +0200
Ninja: use deps = gcc/msvc feature
cmcldeps is now only used for .rc file processing
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index 3e8d4ff..804cce2 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -55,4 +55,4 @@ set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES
"@CMAKE_C_IMPLICIT_LINK_DIRECTORIES@")
set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
"@CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@")
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
-@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
+@SET_CMAKE_CL_SHOWINCLUDES_PREFIX@
diff --git a/Modules/CMakeCXXCompiler.cmake.in
b/Modules/CMakeCXXCompiler.cmake.in
index 777f007..35aa6c4 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -56,4 +56,4 @@ set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
"@CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES@")
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
"@CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@")
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
-@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
+@SET_CMAKE_CL_SHOWINCLUDES_PREFIX@
diff --git a/Modules/CMakeClDeps.cmake b/Modules/CMakeClDeps.cmake
index 0214ead..b46e7c2 100644
--- a/Modules/CMakeClDeps.cmake
+++ b/Modules/CMakeClDeps.cmake
@@ -20,7 +20,7 @@
# in front of each include path, so it can remove it.
#
-if(MSVC_C_ARCHITECTURE_ID AND CMAKE_GENERATOR MATCHES "Ninja" AND
CMAKE_C_COMPILER AND CMAKE_COMMAND)
+if(CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_C_COMPILER AND CMAKE_COMMAND)
string(REPLACE "cmake.exe" "cmcldeps.exe" CMAKE_CMCLDEPS_EXECUTABLE
${CMAKE_COMMAND})
set(showdir ${CMAKE_BINARY_DIR}/CMakeFiles/ShowIncludes)
file(WRITE ${showdir}/foo.h "\n")
@@ -30,5 +30,5 @@ if(MSVC_C_ARCHITECTURE_ID AND CMAKE_GENERATOR MATCHES "Ninja"
AND CMAKE_C_COMPIL
string(REGEX MATCH "\n([^:]*:[^:]*:[ \t]*)" tmp "${outLine}")
set(localizedPrefix "${CMAKE_MATCH_1}")
set(SET_CMAKE_CMCLDEPS_EXECUTABLE "set(CMAKE_CMCLDEPS_EXECUTABLE
\"${CMAKE_CMCLDEPS_EXECUTABLE}\")")
- set(SET_CMAKE_CL_SHOWINCLUDE_PREFIX "set(CMAKE_CL_SHOWINCLUDE_PREFIX
\"${localizedPrefix}\")")
+ set(SET_CMAKE_CL_SHOWINCLUDES_PREFIX "set(CMAKE_CL_SHOWINCLUDES_PREFIX
\"${localizedPrefix}\")")
endif()
diff --git a/Modules/CMakeDetermineCCompiler.cmake
b/Modules/CMakeDetermineCCompiler.cmake
index 8769c66..ce0978c 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -176,12 +176,13 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
endif ()
-include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_C_ARCHITECTURE_ID)
+ include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_C_ARCHITECTURE_ID
"set(MSVC_C_ARCHITECTURE_ID ${MSVC_C_ARCHITECTURE_ID})")
endif()
+
# configure variables set in this file for fast reload later on
configure_file(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in
${CMAKE_PLATFORM_INFO_DIR}/CMakeCCompiler.cmake
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake
b/Modules/CMakeDetermineCXXCompiler.cmake
index c79ba89..d821dcc 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -175,12 +175,13 @@ if (CMAKE_CROSSCOMPILING AND NOT
_CMAKE_TOOLCHAIN_PREFIX)
endif ()
-include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_CXX_ARCHITECTURE_ID)
+ include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_CXX_ARCHITECTURE_ID
"set(MSVC_CXX_ARCHITECTURE_ID ${MSVC_CXX_ARCHITECTURE_ID})")
endif()
+
# configure all variables set in this file
configure_file(${CMAKE_ROOT}/Modules/CMakeCXXCompiler.cmake.in
${CMAKE_PLATFORM_INFO_DI
[Cmake-commits] CMake branch, next, updated. v2.8.12-4218-g400e9b2
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 400e9b26e55ff96dd5b86d9127ca077e1d444862 (commit)
via af2f76d34137bbaaadbc2eb18d6ff5124dc15b80 (commit)
from a00f5dc9af0db7055210a566026de7643682649f (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=400e9b26e55ff96dd5b86d9127ca077e1d444862
commit 400e9b26e55ff96dd5b86d9127ca077e1d444862
Merge: a00f5dc af2f76d
Author: Peter Kuemmel
AuthorDate: Mon Oct 21 09:59:18 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 09:59:18 2013 -0400
Merge topic 'ninja-remove-cmcldeps' into next
af2f76d Revert "Ninja: use deps = gcc/msvc feature"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af2f76d34137bbaaadbc2eb18d6ff5124dc15b80
commit af2f76d34137bbaaadbc2eb18d6ff5124dc15b80
Author: Peter Kümmel
AuthorDate: Mon Oct 21 15:53:46 2013 +0200
Commit: Peter Kümmel
CommitDate: Mon Oct 21 15:54:12 2013 +0200
Revert "Ninja: use deps = gcc/msvc feature"
This reverts commit ba54dc09fb69488ab95cb967240b09e30a0006b4.
Next commit fixes line sizes.
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index 804cce2..3e8d4ff 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -55,4 +55,4 @@ set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES
"@CMAKE_C_IMPLICIT_LINK_DIRECTORIES@")
set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
"@CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@")
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
-@SET_CMAKE_CL_SHOWINCLUDES_PREFIX@
+@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
diff --git a/Modules/CMakeCXXCompiler.cmake.in
b/Modules/CMakeCXXCompiler.cmake.in
index 35aa6c4..777f007 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -56,4 +56,4 @@ set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
"@CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES@")
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
"@CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@")
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
-@SET_CMAKE_CL_SHOWINCLUDES_PREFIX@
+@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
diff --git a/Modules/CMakeClDeps.cmake b/Modules/CMakeClDeps.cmake
index b46e7c2..0214ead 100644
--- a/Modules/CMakeClDeps.cmake
+++ b/Modules/CMakeClDeps.cmake
@@ -20,7 +20,7 @@
# in front of each include path, so it can remove it.
#
-if(CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_C_COMPILER AND CMAKE_COMMAND)
+if(MSVC_C_ARCHITECTURE_ID AND CMAKE_GENERATOR MATCHES "Ninja" AND
CMAKE_C_COMPILER AND CMAKE_COMMAND)
string(REPLACE "cmake.exe" "cmcldeps.exe" CMAKE_CMCLDEPS_EXECUTABLE
${CMAKE_COMMAND})
set(showdir ${CMAKE_BINARY_DIR}/CMakeFiles/ShowIncludes)
file(WRITE ${showdir}/foo.h "\n")
@@ -30,5 +30,5 @@ if(CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_C_COMPILER AND
CMAKE_COMMAND)
string(REGEX MATCH "\n([^:]*:[^:]*:[ \t]*)" tmp "${outLine}")
set(localizedPrefix "${CMAKE_MATCH_1}")
set(SET_CMAKE_CMCLDEPS_EXECUTABLE "set(CMAKE_CMCLDEPS_EXECUTABLE
\"${CMAKE_CMCLDEPS_EXECUTABLE}\")")
- set(SET_CMAKE_CL_SHOWINCLUDES_PREFIX "set(CMAKE_CL_SHOWINCLUDES_PREFIX
\"${localizedPrefix}\")")
+ set(SET_CMAKE_CL_SHOWINCLUDE_PREFIX "set(CMAKE_CL_SHOWINCLUDE_PREFIX
\"${localizedPrefix}\")")
endif()
diff --git a/Modules/CMakeDetermineCCompiler.cmake
b/Modules/CMakeDetermineCCompiler.cmake
index ce0978c..8769c66 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -176,13 +176,12 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
endif ()
+include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_C_ARCHITECTURE_ID)
- include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_C_ARCHITECTURE_ID
"set(MSVC_C_ARCHITECTURE_ID ${MSVC_C_ARCHITECTURE_ID})")
endif()
-
# configure variables set in this file for fast reload later on
configure_file(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in
${CMAKE_PLATFORM_INFO_DIR}/CMakeCCompiler.cmake
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake
b/Modules/CMakeDetermineCXXCompiler.cmake
index d821dcc..c79ba89 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -175,13 +175,12 @@ if (CMAKE_CROSSCOMPILING AND NOT
_CMAKE_TOOLCHAIN_PREFIX)
endif ()
+include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_CXX_ARCHITECTURE_ID)
- include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_CXX_ARCHITECTURE_ID
"set(MSVC_CXX_ARCHITECTURE_ID ${MSVC_CXX_ARCHITECTURE_ID})")
endif()
-
# configure all variables set in this file
configure_file(${CMAKE_ROOT}/
[Cmake-commits] CMake branch, next, updated. v2.8.12-4216-ga00f5dc
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 a00f5dc9af0db7055210a566026de7643682649f (commit)
via f063c45589e83bf8e4ef61f49b17084debf085a2 (commit)
from 51e5088fd8a56be26d11cac5c2466f27acec69fa (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=a00f5dc9af0db7055210a566026de7643682649f
commit a00f5dc9af0db7055210a566026de7643682649f
Merge: 51e5088 f063c45
Author: Stephen Kelly
AuthorDate: Mon Oct 21 09:56:53 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 09:56:53 2013 -0400
Merge topic 'double-colon-is-imported' into next
f063c45 Consider targets with double colons to be IMPORTED or ALIAS targets.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f063c45589e83bf8e4ef61f49b17084debf085a2
commit f063c45589e83bf8e4ef61f49b17084debf085a2
Author: Stephen Kelly
AuthorDate: Tue Jul 30 09:51:56 2013 +0200
Commit: Stephen Kelly
CommitDate: Mon Oct 21 15:56:31 2013 +0200
Consider targets with double colons to be IMPORTED or ALIAS targets.
Introduce a policy to control the behavior.
The AliasTargets unit test already tests that using a
double-semicolon in the name is not an error. Change the ExportImport
test to use a namespace with a double-semicolon too.
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 658620f..f03cbe1 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -37,3 +37,4 @@ All Policies
/policy/CMP0025
/policy/CMP0026
/policy/CMP0027
+ /policy/CMP0028
diff --git a/Help/policy/CMP0028.rst b/Help/policy/CMP0028.rst
new file mode 100644
index 000..ec318a0
--- /dev/null
+++ b/Help/policy/CMP0028.rst
@@ -0,0 +1,23 @@
+CMP0028
+---
+
+Double colon in target name means ALIAS or IMPORTED target.
+
+CMake 2.8.12 and lower allowed the use of targets and files with double
+colons in target_link_libraries, with some buildsystem generators.
+
+The use of double-colons is a common pattern used to namespace IMPORTED
+targets and ALIAS targets. When computing the link dependencies of a target,
+the name of each dependency could either be a target, or a file on disk.
+Previously, if a target was not found with a matching name, the name was
+considered to refer to a file on disk. This can lead to confusing error
+messages if there is a typo in what should be a target name.
+
+The OLD behavior for this policy is to search for targets, then files on disk,
+even if the search term contains double-colons. The NEW behavior for this
+policy is to issue a FATAL_ERROR if a link dependency contains
+double-colons but is not an IMPORTED target or an ALIAS target.
+
+This policy was introduced in CMake version 3.0.0. CMake version
+|release| warns when the policy is not set and uses OLD behavior. Use
+the cmake_policy command to set it to OLD or NEW explicitly.
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index ffab8e5..f7efc1e 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -241,6 +241,11 @@ cmPolicies::cmPolicies()
CMP0027, "CMP0027",
"Conditionally linked imported targets with missing include directories.",
3,0,0,0, cmPolicies::WARN);
+
+ this->DefinePolicy(
+CMP0028, "CMP0028",
+"Double colon in target name means ALIAS or IMPORTED target.",
+3,0,0,0, cmPolicies::WARN);
}
cmPolicies::~cmPolicies()
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 39c2afb..68cd7c2 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -79,6 +79,7 @@ public:
CMP0026, ///< Disallow use of the LOCATION target property.
CMP0027, ///< Conditionally linked imported targets with missing include
/// directories.
+CMP0028, ///< Double colon in target name means ALIAS or IMPORTED target.
/** \brief Always the last entry.
*
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b6182ab..647eb76 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5483,6 +5483,46 @@ void cmTarget::ComputeLinkImplementation(const char*
config,
{
continue;
}
+cmTarget *tgt = this->Makefile->FindTargetToUse(li->c_str());
+
+if(!tgt && std::string(item).find("::") != std::string::npos)
+ {
+ bool noMessage = false;
+ cmake::MessageType messageType = cmake::FATAL_ERROR;
+ cmOStringStream e;
+ switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0028))
+{
+case cmPolicies::WARN:
+ {
+ e << (this->Makefile->GetPolicies()
+->GetPolicyWarning(cmPolicies::CMP002
[Cmake-commits] CMake branch, next, updated. v2.8.12-4214-g51e5088
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 51e5088fd8a56be26d11cac5c2466f27acec69fa (commit)
via 7f177a8ccfbb44a0a22250dfa3caf9c4cc7e984d (commit)
from 24146bfcd7e07a5bf88df300bbf6acc63cc680f1 (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=51e5088fd8a56be26d11cac5c2466f27acec69fa
commit 51e5088fd8a56be26d11cac5c2466f27acec69fa
Merge: 24146bf 7f177a8
Author: Stephen Kelly
AuthorDate: Mon Oct 21 09:56:20 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 09:56:20 2013 -0400
Merge topic 'double-colon-is-imported' into next
7f177a8 Don't create a try_compile test with :: in the name
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f177a8ccfbb44a0a22250dfa3caf9c4cc7e984d
commit 7f177a8ccfbb44a0a22250dfa3caf9c4cc7e984d
Author: Stephen Kelly
AuthorDate: Mon Oct 21 15:54:24 2013 +0200
Commit: Stephen Kelly
CommitDate: Mon Oct 21 15:54:24 2013 +0200
Don't create a try_compile test with :: in the name
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt
b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index e31031c..cf7e2bc 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -21,7 +21,7 @@ include(CheckCXXSourceCompiles)
macro(do_try_compile prefix)
- set(CMAKE_REQUIRED_LIBRARIES ${prefix}headeronly)
+ set(CMAKE_REQUIRED_LIBRARIES ${prefix}::headeronly)
check_cxx_source_compiles(
"
#include \"headeronly.h\"
@@ -42,7 +42,7 @@ macro(do_try_compile prefix)
endif()
endmacro()
-do_try_compile(bld::)
+do_try_compile(bld)
add_executable(headeronlytest_exp headeronlytest.cpp)
target_link_libraries(headeronlytest_exp exp::headeronly)
@@ -52,4 +52,4 @@ set_property(TARGET exp::sharediface APPEND PROPERTY
INTERFACE_LINK_LIBRARIES de
add_executable(interfacetest_exp interfacetest.cpp)
target_link_libraries(interfacetest_exp exp::sharediface)
-do_try_compile(exp::)
+do_try_compile(exp)
---
Summary of changes:
Tests/ExportImport/Import/Interface/CMakeLists.txt |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4212-g24146bf
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 24146bfcd7e07a5bf88df300bbf6acc63cc680f1 (commit) via bf02e750796c6b42b0e9d39ba322cd5191489a0e (commit) from 334d6e332fde0b7e8336918ebc6d7b8d0f46d54d (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=24146bfcd7e07a5bf88df300bbf6acc63cc680f1 commit 24146bfcd7e07a5bf88df300bbf6acc63cc680f1 Merge: 334d6e3 bf02e75 Author: Brad King AuthorDate: Mon Oct 21 09:48:36 2013 -0400 Commit: Brad King CommitDate: Mon Oct 21 09:48:36 2013 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12-383-gbf02e75
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, master has been updated via bf02e750796c6b42b0e9d39ba322cd5191489a0e (commit) via b04f3b9a2a116b1956d5342637cda1348a5ee07b (commit) via dba4962b868c3baa7886dcd3f8b597e971a479a2 (commit) from 6d1444feacb1c2d621b776ac61412f92ff0a1c34 (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=bf02e750796c6b42b0e9d39ba322cd5191489a0e commit bf02e750796c6b42b0e9d39ba322cd5191489a0e Merge: 6d1444f b04f3b9 Author: Brad King AuthorDate: Mon Oct 21 09:48:04 2013 -0400 Commit: CMake Topic Stage CommitDate: Mon Oct 21 09:48:04 2013 -0400 Merge topic 'INTERFACE_LIBRARY-build-targets' b04f3b9 Create make rules for INTERFACE_LIBRARY targets. dba4962 Makefile: Always create clean target command --- Summary of changes: Source/cmComputeTargetDepends.cxx | 10 +++- Source/cmGlobalUnixMakefileGenerator3.cxx | 92 --- Source/cmLocalUnixMakefileGenerator3.cxx| 73 +++--- Source/cmMakefileLibraryTargetGenerator.cxx |3 + Source/cmMakefileTargetGenerator.cxx|1 + Source/cmTarget.cxx | 23 +++ Source/cmTarget.h |3 + Tests/CMakeLists.txt| 17 + Tests/InterfaceBuildTargets/CMakeLists.txt | 13 Tests/InterfaceBuildTargets/main.cxx|5 ++ Tests/InterfaceBuildTargets/testlib.cxx |5 ++ 11 files changed, 171 insertions(+), 74 deletions(-) create mode 100644 Tests/InterfaceBuildTargets/CMakeLists.txt create mode 100644 Tests/InterfaceBuildTargets/main.cxx create mode 100644 Tests/InterfaceBuildTargets/testlib.cxx hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4210-g334d6e3
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 334d6e332fde0b7e8336918ebc6d7b8d0f46d54d (commit)
via b04f3b9a2a116b1956d5342637cda1348a5ee07b (commit)
from 739215f342a68c9c91ab64db664159808318b27e (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=334d6e332fde0b7e8336918ebc6d7b8d0f46d54d
commit 334d6e332fde0b7e8336918ebc6d7b8d0f46d54d
Merge: 739215f b04f3b9
Author: Brad King
AuthorDate: Mon Oct 21 09:47:18 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 21 09:47:18 2013 -0400
Merge topic 'INTERFACE_LIBRARY-build-targets' into next
b04f3b9 Create make rules for INTERFACE_LIBRARY targets.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b04f3b9a2a116b1956d5342637cda1348a5ee07b
commit b04f3b9a2a116b1956d5342637cda1348a5ee07b
Author: Stephen Kelly
AuthorDate: Wed Aug 21 22:00:48 2013 +0200
Commit: Brad King
CommitDate: Mon Oct 21 09:46:27 2013 -0400
Create make rules for INTERFACE_LIBRARY targets.
The result is that the depends of the target are created.
So,
add_library(somelib foo.cpp)
add_library(anotherlib EXCLUDE_FROM_ALL foo.cpp)
add_library(extra EXCLUDE_FROM_ALL foo.cpp)
target_link_libraries(anotherlib extra)
add_library(iface INTERFACE)
target_link_libraries(iface INTERFACE anotherlib)
Executing 'make iface' will result in the anotherlib and extra targets
being made.
Adding a regular executable to the INTERFACE of an INTERFACE_LIBRARY
will not result in the executable being built with 'make iface' because
of the logic in cmComputeTargetDepends::AddTargetDepend.
So far, this is implemented only for the Makefile generator. Other
generators will follow if this feature is possible for them.
Make INTERFACE_LIBRARY targets part of the all target by default.
Test this by building the all target and making the expected library
EXCLUDE_FROM_ALL.
diff --git a/Source/cmComputeTargetDepends.cxx
b/Source/cmComputeTargetDepends.cxx
index 0829add..7fd4754 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -208,7 +208,15 @@ void cmComputeTargetDepends::CollectTargetDepends(int
depender_index)
std::set emitted;
{
std::vector tlibs;
- depender->GetDirectLinkLibraries(0, tlibs, depender);
+ if (depender->GetType() == cmTarget::INTERFACE_LIBRARY)
+{
+// For INTERFACE_LIBRARY depend on the interface instead.
+depender->GetInterfaceLinkLibraries(0, tlibs, depender);
+}
+ else
+{
+depender->GetDirectLinkLibraries(0, tlibs, depender);
+}
// A target should not depend on itself.
emitted.insert(depender->GetName());
for(std::vector::const_iterator lib = tlibs.begin();
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx
b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 7ab107f..ce95c08 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -435,6 +435,7 @@ cmGlobalUnixMakefileGenerator3
(l->second.GetType() == cmTarget::SHARED_LIBRARY) ||
(l->second.GetType() == cmTarget::MODULE_LIBRARY) ||
(l->second.GetType() == cmTarget::OBJECT_LIBRARY) ||
+ (l->second.GetType() == cmTarget::INTERFACE_LIBRARY) ||
(l->second.GetType() == cmTarget::UTILITY))
{
// Add this to the list of depends rules in this directory.
@@ -612,6 +613,7 @@ cmGlobalUnixMakefileGenerator3
(t->second.GetType() == cmTarget::SHARED_LIBRARY) ||
(t->second.GetType() == cmTarget::MODULE_LIBRARY) ||
(t->second.GetType() == cmTarget::OBJECT_LIBRARY) ||
+ (t->second.GetType() == cmTarget::INTERFACE_LIBRARY) ||
(t->second.GetType() == cmTarget::UTILITY)))
{
// Add a rule to build the target by name.
@@ -633,6 +635,10 @@ cmGlobalUnixMakefileGenerator3
t->second.GetName(), depends, commands,
true);
+if (t->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+ {
+ continue;
+ }
// Add a fast rule to build the target
std::string localName = lg->GetRelativeTargetDirectory(t->second);
std::string makefileName;
@@ -699,6 +705,7 @@ cmGlobalUnixMakefileGenerator3
|| (t->second.GetType() == cmTarget::SHARED_LIBRARY)
|| (t->second.GetType() == cmTarget::MODULE_LIBRARY)
|| (t->second.GetType() == cmTarget::OBJECT_LIBRARY)
+|| (t->second.GetType() == cmTarget::INTERFACE_LIBRARY)
|| (t->se
[Cmake-commits] CMake branch, next, updated. v2.8.12-4208-g739215f
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 739215f342a68c9c91ab64db664159808318b27e (commit) via 6d1444feacb1c2d621b776ac61412f92ff0a1c34 (commit) via d06610888dd357a7085be0bfff86f5d5d291771d (commit) via 595060f3837a7da28810c644177b63d6319631b6 (commit) via 8fa1ceb136dfa6c4d969fe78f4ebb46ae0abe6d0 (commit) via 9fb65d7090ca314cd8bfd88e52fefa6905938a6d (commit) via ecfcce44b31ad7a6a39088e950ba36a0d8abc517 (commit) from 4a9d26b5eb5f46d9f09cfe5366bddb43fd48ec0d (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=739215f342a68c9c91ab64db664159808318b27e commit 739215f342a68c9c91ab64db664159808318b27e Merge: 4a9d26b 6d1444f Author: Brad King AuthorDate: Mon Oct 21 09:04:53 2013 -0400 Commit: Brad King CommitDate: Mon Oct 21 09:04:53 2013 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12-380-g6d1444f
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, master has been updated via 6d1444feacb1c2d621b776ac61412f92ff0a1c34 (commit) via 187385a8edaaf907e449478706240236a84cd266 (commit) via af2a3ab691140b67cccb67a9417738c5fd502cfb (commit) via 620b0e92fce77ccdfc2f35485e31dcdf756962d5 (commit) via 2d4ce8054900216f554dede6dec843741e8c97f5 (commit) via d6dd264671a10da9c942361b1559d757c35fa0ae (commit) from d06610888dd357a7085be0bfff86f5d5d291771d (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=6d1444feacb1c2d621b776ac61412f92ff0a1c34 commit 6d1444feacb1c2d621b776ac61412f92ff0a1c34 Merge: d066108 187385a Author: Brad King AuthorDate: Mon Oct 21 09:02:31 2013 -0400 Commit: CMake Topic Stage CommitDate: Mon Oct 21 09:02:31 2013 -0400 Merge topic 'minor-cleanups' 187385a cmCoreTryCompile: Fix typo in comments. af2a3ab cmTarget: Remove unused variable. 620b0e9 target_link_libraries(): Fix code snippet in documentation. 2d4ce80 cmPolicies: Fix typo d6dd264 include(): Use lower case and () to refer to the include() command. --- Summary of changes: Help/command/target_link_libraries.rst |3 ++- Help/policy/CMP0017.rst|2 +- Source/cmCoreTryCompile.cxx|4 ++-- Source/cmIncludeCommand.cxx|2 +- Source/cmTarget.cxx|1 - 5 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12-374-gd066108
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, master has been updated via d06610888dd357a7085be0bfff86f5d5d291771d (commit) via 765d783972dbacc336d11803cccf56cdc9aac6c5 (commit) via 52b80b2643acdd2f31582fe20773cc4c3740b9ad (commit) via c076476d7de18802d99d3c715caee54f05d52781 (commit) via f551135208adc1ac8990f5309ec54325cf897d7d (commit) from 595060f3837a7da28810c644177b63d6319631b6 (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=d06610888dd357a7085be0bfff86f5d5d291771d commit d06610888dd357a7085be0bfff86f5d5d291771d Merge: 595060f 765d783 Author: Brad King AuthorDate: Mon Oct 21 09:02:26 2013 -0400 Commit: CMake Topic Stage CommitDate: Mon Oct 21 09:02:26 2013 -0400 Merge topic 'remove-old-process-execution' 765d783 cmSystemTools: Drop old RunCommand method 52b80b2 exec_program: Re-implement using KWSys Process c076476 cmake: Drop "cmake -E comspec" Win9x helper f551135 cmExtraEclipseCDT4Generator: Replace RunCommand with RunSingleCommand --- Summary of changes: Help/manual/cmake.1.rst|2 +- Source/CMakeLists.txt | 12 - Source/CPack/cpack.cxx |5 - Source/cmExecProgramCommand.cxx| 196 +++- Source/cmExecProgramCommand.h |4 + Source/cmExtraEclipseCDT4Generator.cxx |2 +- Source/cmSystemTools.cxx | 358 - Source/cmSystemTools.h | 27 - Source/cmWin32ProcessExecution.cxx | 884 Source/cmWin32ProcessExecution.h | 169 -- Source/cmake.cxx |4 - Source/cmcmd.cxx | 14 +- Source/cmw9xcom.cxx| 45 -- Source/ctest.cxx |4 - bootstrap |3 +- 15 files changed, 201 insertions(+), 1528 deletions(-) delete mode 100644 Source/cmWin32ProcessExecution.cxx delete mode 100644 Source/cmWin32ProcessExecution.h delete mode 100644 Source/cmw9xcom.cxx hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12-369-g595060f
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, master has been updated via 595060f3837a7da28810c644177b63d6319631b6 (commit) via 6d50d0197a50680466c075feeda338b3b9418e05 (commit) from 8fa1ceb136dfa6c4d969fe78f4ebb46ae0abe6d0 (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=595060f3837a7da28810c644177b63d6319631b6 commit 595060f3837a7da28810c644177b63d6319631b6 Merge: 8fa1ceb 6d50d01 Author: Brad King AuthorDate: Mon Oct 21 09:02:17 2013 -0400 Commit: CMake Topic Stage CommitDate: Mon Oct 21 09:02:17 2013 -0400 Merge topic 'policies-generic-docs' 6d50d01 Help: Add introduction section to cmake-policies manual --- Summary of changes: Help/manual/cmake-policies.7.rst | 20 1 files changed, 20 insertions(+), 0 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12-367-g8fa1ceb
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, master has been updated via 8fa1ceb136dfa6c4d969fe78f4ebb46ae0abe6d0 (commit) via 216afc8a818c4f8906b17aefedbc9b9ed60564a8 (commit) from 9fb65d7090ca314cd8bfd88e52fefa6905938a6d (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=8fa1ceb136dfa6c4d969fe78f4ebb46ae0abe6d0 commit 8fa1ceb136dfa6c4d969fe78f4ebb46ae0abe6d0 Merge: 9fb65d7 216afc8 Author: Brad King AuthorDate: Mon Oct 21 09:02:09 2013 -0400 Commit: CMake Topic Stage CommitDate: Mon Oct 21 09:02:09 2013 -0400 Merge topic 'vs12-parallel-cl-FS' 216afc8 MSVC: Add /FS flag for cl >= 18 to allow parallel compilation (#14492) --- Summary of changes: Modules/Platform/Windows-MSVC-C.cmake |3 +++ Modules/Platform/Windows-MSVC-CXX.cmake |3 +++ Modules/Platform/Windows-MSVC.cmake |2 +- 3 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12-365-g9fb65d7
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, master has been updated via 9fb65d7090ca314cd8bfd88e52fefa6905938a6d (commit) via daa0f6f98df6e944a46a8dff13bb247cf7e301b1 (commit) via a8c652342f0e4dcaf933ecb0ce164b44d4997ae4 (commit) via dbd933365ec780d27ab7c0dfba30dc1af1094607 (commit) via 56457837e28de29d4f94b0cc9c47ef314d8f05e1 (commit) from ecfcce44b31ad7a6a39088e950ba36a0d8abc517 (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=9fb65d7090ca314cd8bfd88e52fefa6905938a6d commit 9fb65d7090ca314cd8bfd88e52fefa6905938a6d Merge: ecfcce4 daa0f6f Author: Brad King AuthorDate: Mon Oct 21 09:02:00 2013 -0400 Commit: CMake Topic Stage CommitDate: Mon Oct 21 09:02:00 2013 -0400 Merge topic 'cmake-syntax-updates' daa0f6f Add Lua-style long brackets and long comments to CMake language a8c6523 cmListFileLexer: Convert CRLF -> LF newlines explicitly dbd9333 cmListFileLexer: Allow a leading UTF-8 Byte-Order-Mark (#11137) 5645783 cmListFileLexer: Allow command names with one letter (#14181) --- Summary of changes: Source/cmListFileCache.cxx | 95 +++-- Source/cmListFileCache.h |3 +- Source/cmListFileLexer.c | 462 +++- Source/cmListFileLexer.h | 17 +- Source/cmListFileLexer.in.l| 190 - Source/cmMakefile.cxx |6 + Tests/RunCMake/Syntax/.gitattributes |2 + .../BOM-UTF-16-BE-result.txt} |0 Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt |6 + Tests/RunCMake/Syntax/BOM-UTF-16-BE.cmake | Bin 0 -> 54 bytes .../BOM-UTF-16-LE-result.txt} |0 Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt |6 + Tests/RunCMake/Syntax/BOM-UTF-16-LE.cmake | Bin 0 -> 54 bytes .../BOM-UTF-32-BE-result.txt} |0 Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt |6 + Tests/RunCMake/Syntax/BOM-UTF-32-BE.cmake | Bin 0 -> 108 bytes .../BOM-UTF-32-LE-result.txt} |0 Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt |6 + Tests/RunCMake/Syntax/BOM-UTF-32-LE.cmake | Bin 0 -> 108 bytes Tests/RunCMake/Syntax/BOM-UTF-8-stdout.txt |1 + Tests/RunCMake/Syntax/BOM-UTF-8.cmake |1 + Tests/RunCMake/Syntax/Bracket0-stderr.txt |1 + Tests/RunCMake/Syntax/Bracket0.cmake |1 + Tests/RunCMake/Syntax/Bracket1-stderr.txt |1 + Tests/RunCMake/Syntax/Bracket1.cmake |2 + Tests/RunCMake/Syntax/Bracket2-stdout.txt |2 + Tests/RunCMake/Syntax/Bracket2.cmake |2 + .../BracketBackslash-result.txt} |0 Tests/RunCMake/Syntax/BracketBackslash-stderr.txt |6 + Tests/RunCMake/Syntax/BracketBackslash.cmake |2 + Tests/RunCMake/Syntax/BracketCRLF-stderr.txt |1 + Tests/RunCMake/Syntax/BracketCRLF.cmake|8 + Tests/RunCMake/Syntax/BracketComment0-stdout.txt |1 + Tests/RunCMake/Syntax/BracketComment0.cmake|5 + .../BracketComment1-result.txt}|0 Tests/RunCMake/Syntax/BracketComment1-stderr.txt |4 + Tests/RunCMake/Syntax/BracketComment1.cmake|3 + .../BracketComment2-result.txt}|0 Tests/RunCMake/Syntax/BracketComment2-stderr.txt |4 + Tests/RunCMake/Syntax/BracketComment2.cmake|3 + Tests/RunCMake/Syntax/BracketComment3-stdout.txt |1 + Tests/RunCMake/Syntax/BracketComment3.cmake|4 + .../BracketComment4-result.txt}|0 Tests/RunCMake/Syntax/BracketComment4-stderr.txt |7 + Tests/RunCMake/Syntax/BracketComment4.cmake|3 + Tests/RunCMake/Syntax/BracketComment5-stdout.txt |1 + Tests/RunCMake/Syntax/BracketComment5.cmake|6 + .../BracketNoSpace0-result.txt}|0 Tests/RunCMake/Syntax/BracketNoSpace0-stderr.txt |6 + Tests/RunCMake/Syntax/BracketNoSpace0.cmake|1 + .../BracketNoSpace1-result.txt}|0 Tests/RunCMake/Syntax/BracketNoSpace1-stderr.txt |6 + Tests/RunCMake/Syntax/BracketNoSpace1.cmake|1 + .../BracketNoSpace2-result.txt}|0 Tests/RunCMake/Syntax/BracketNoSpace2-stderr.txt |6 + Tests/RunCMake/Syntax/BracketNoSpace2.cma
