[cmake-developers] [CMake 0015639]: [Feature Request] Generate one VS solution for several toolsets and architectures
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=15639 == Reported By:KindDragon Assigned To: == Project:CMake Issue ID: 15639 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2015-07-05 11:24 EDT Last Modified: 2015-07-05 11:24 EDT == Summary:[Feature Request] Generate one VS solution for several toolsets and architectures Description: I want generate one Visual Studio 14 2015 solution for several toolsets (VS2012, VS2013, VS2015) and several architectures (Win32, x64) == Issue History Date ModifiedUsername FieldChange == 2015-07-05 11:24 KindDragon New Issue == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions
Hi, you must set the following in the root CMakeLists.txt file: set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) Did you mean that? http://www.cmake.org/cmake/help/v3.2/variable/CMAKE_CXX_STANDARD.html http://www.cmake.org/cmake/help/v3.2/variable/CMAKE_CXX_STANDARD_REQUIRED.ht ml Best Regards Roman Von: CMake [mailto:cmake-boun...@cmake.org] Im Auftrag von Michael Jackson Gesendet: Sonntag, 05. Juli 2015 18:07 An: cmake@cmake.org Betreff: Re: [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions Is there a project wide CXX_STANDARD_REQUIRED that I can set? I am wanting to migrate our project to C++ 11 and would rather set something in the project root rather than find every place where our own and our customers plugin codes create a target. Thanks Mike Jackson On Jul 4, 2015, at 5:13 PM, digitalriptide digitalript...@gmail.com mailto:digitalript...@gmail.com wrote: Thank you for the pointers, adding set( CMAKE_CXX_EXTENSIONS OFF ) to the root CMakeLists.txt disabled the extensions through the project. On Sat, Jul 4, 2015 at 3:52 PM, Thompson, KT k...@lanl.gov mailto:k...@lanl.gov wrote: Try setting CMAKE_CXX_EXTENSIONS this to OFF. http://www.cmake.org/cmake/help/v3.2/prop_tgt/CXX_EXTENSIONS.html#prop_tgt:C XX_EXTENSIONS From: CMake [mailto:cmake-boun...@cmake.org mailto:cmake-boun...@cmake.org ] On Behalf Of Scott Aron Bloom Sent: Saturday, July 04, 2015 1:17 AM To: digitalriptide; cmake@cmake.org mailto:cmake@cmake.org Subject: Re: [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions This is why I dont use the CXX_STANDARD and instead use the CXX_FLAGS and add the flag I need. From: CMake [mailto:cmake-boun...@cmake.org] On Behalf Of digitalriptide Sent: Friday, July 3, 2015 1:56 PM To: cmake@cmake.org mailto:cmake@cmake.org Subject: [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions If I enable C++11 for some target via set_target_properties( SomeTarget PROPERTIES CXX_STANDARD 11 ) set_target_properties( SomeTarget PROPERTIES CXX_STANDARD_REQUIRED ON ) with GCC, the code will then compile with -std=gnu++11. Compiling with -std=gnu++11 enables C++11 *and* the GNU extensions. Is there an option that will result in -std=c++11 in lieu of -std=gnu++11, to build without the the GNU extensions? Thank you! -- Powered by www.kitware.com http://www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions
Is there a project wide CXX_STANDARD_REQUIRED that I can set? I am wanting to migrate our project to C++ 11 and would rather set something in the project root rather than find every place where our own and our customers plugin codes create a target. Thanks Mike Jackson On Jul 4, 2015, at 5:13 PM, digitalriptide digitalript...@gmail.com wrote: Thank you for the pointers, adding set( CMAKE_CXX_EXTENSIONS OFF ) to the root CMakeLists.txt disabled the extensions through the project. On Sat, Jul 4, 2015 at 3:52 PM, Thompson, KT k...@lanl.gov wrote: Try setting CMAKE_CXX_EXTENSIONS this to OFF. http://www.cmake.org/cmake/help/v3.2/prop_tgt/CXX_EXTENSIONS.html#prop_tgt:CXX_EXTENSIONS From: CMake [mailto:cmake-boun...@cmake.org] On Behalf Of Scott Aron Bloom Sent: Saturday, July 04, 2015 1:17 AM To: digitalriptide; cmake@cmake.org Subject: Re: [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions This is why I don’t use the CXX_STANDARD and instead use the CXX_FLAGS and add the flag I need. From: CMake [mailto:cmake-boun...@cmake.org] On Behalf Of digitalriptide Sent: Friday, July 3, 2015 1:56 PM To: cmake@cmake.org Subject: [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions If I enable C++11 for some target via set_target_properties( SomeTarget PROPERTIES CXX_STANDARD 11 ) set_target_properties( SomeTarget PROPERTIES CXX_STANDARD_REQUIRED ON ) with GCC, the code will then compile with -std=gnu++11. Compiling with -std=gnu++11 enables C++11 *and* the GNU extensions. Is there an option that will result in -std=c++11 in lieu of -std=gnu++11, to build without the the GNU extensions? Thank you! -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions
Cool, I think that is what I want. -- Mike Jackson Roman Wüger wrote: Hi, you must set the following in the root CMakeLists.txt file: set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) Did you mean that? http://www.cmake.org/cmake/help/v3.2/variable/CMAKE_CXX_STANDARD.html http://www.cmake.org/cmake/help/v3.2/variable/CMAKE_CXX_STANDARD_REQUIRED.html Best Regards Roman *Von:*CMake [mailto:cmake-boun...@cmake.org] *Im Auftrag von *Michael Jackson *Gesendet:* Sonntag, 05. Juli 2015 18:07 *An:* cmake@cmake.org *Betreff:* Re: [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions Is there a project wide CXX_STANDARD_REQUIRED that I can set? I am wanting to migrate our project to C++ 11 and would rather set something in the project root rather than find every place where our own and our customers plugin codes create a target. Thanks Mike Jackson On Jul 4, 2015, at 5:13 PM, digitalriptide digitalript...@gmail.com mailto:digitalript...@gmail.com wrote: Thank you for the pointers, adding set( CMAKE_CXX_EXTENSIONS OFF ) to the root CMakeLists.txt disabled the extensions through the project. On Sat, Jul 4, 2015 at 3:52 PM, Thompson, KT k...@lanl.gov mailto:k...@lanl.gov wrote: Try setting CMAKE_CXX_EXTENSIONS this to OFF. http://www.cmake.org/cmake/help/v3.2/prop_tgt/CXX_EXTENSIONS.html#prop_tgt:CXX_EXTENSIONS *From:*CMake [mailto:cmake-boun...@cmake.org mailto:cmake-boun...@cmake.org] *On Behalf Of *Scott Aron Bloom *Sent:* Saturday, July 04, 2015 1:17 AM *To:* digitalriptide; cmake@cmake.org mailto:cmake@cmake.org *Subject:* Re: [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions This is why I don’t use the CXX_STANDARD and instead use the CXX_FLAGS and add the flag I need. *From:*CMake [mailto:cmake-boun...@cmake.org] *On Behalf Of *digitalriptide *Sent:* Friday, July 3, 2015 1:56 PM *To:* cmake@cmake.org mailto:cmake@cmake.org *Subject:* [CMake] Setting CXX_STANDARD 11 Enables GNU Extensions If I enable C++11 for some target via set_target_properties( SomeTarget PROPERTIES CXX_STANDARD 11 ) set_target_properties( SomeTarget PROPERTIES CXX_STANDARD_REQUIRED ON ) with GCC, the code will then compile with -std=gnu++11. Compiling with -std=gnu++11 enables C++11 *and* the GNU extensions. Is there an option that will result in -std=c++11 in lieu of -std=gnu++11, to build without the the GNU extensions? Thank you! -- Powered by www.kitware.com http://www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-820-g1965936
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 1965936bb20f40951a1ee597769e4b92e3ae7713 (commit)
via 87c81096f92e860a6ebcaac0d29c427d9c6fd1bd (commit)
via 25fcf27cc84dda5fb1316aa99e73ee7dc1bec355 (commit)
via e5e2563e92ced9bd5718645b8999596f4a841632 (commit)
via 1ca1dd80314bc6182b3b2d01c3bf60f7b39693cf (commit)
via df2cb683e045c7906bcca5d0bf7614d8e1360286 (commit)
via 30d44efaf86194271c70f90a8fafa94a7d56f92c (commit)
via 6361f680568c81e0391fa56cf9a7f4637bd745dc (commit)
via 94704d759cc8939f3573122d36d52c4598fd04ba (commit)
via a8e54460243b0650145c8684f3d8deb8a712376a (commit)
via dbafb01580a0d35e33e6577ad07002f4dd345236 (commit)
via 27ff19a96a7d12f2ed6d9683ef733eff6378472a (commit)
via 58853582be7c8a362db5d220c87025a1c19d1c8a (commit)
from a1c8ac3911b6af3f34a634ff9c7cb3657abdc228 (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=1965936bb20f40951a1ee597769e4b92e3ae7713
commit 1965936bb20f40951a1ee597769e4b92e3ae7713
Merge: a1c8ac3 87c8109
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Sun Jul 5 19:37:41 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Jul 5 19:37:41 2015 -0400
Merge topic 'refactor-cmListFileBacktrace' into next
87c81096 cmListFileBacktrace: Implement in terms of cmState::Snapshot.
25fcf27c cmListFile: Remove FilePath member from cmListFileContext.
e5e2563e cmMakefile: Set the FilePath on the frame from the cmState.
1ca1dd80 cmMakefile: Create intermediate variables for snapshot frames.
df2cb683 cmMakefile: Create a scoped context for parsing listfiles.
30d44efa cmMakefile: Access the execution list file from the cmState.
6361f680 cmState: Store execution context.
94704d75 cmState: Add GetCallStackParent method.
a8e54460 cmState: Store snapshots for more different types.
dbafb015 cmMakefile: Split CallStack into two pieces.
27ff19a9 cmLinkedTree: Add operator* to the iterator.
58853582 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87c81096f92e860a6ebcaac0d29c427d9c6fd1bd
commit 87c81096f92e860a6ebcaac0d29c427d9c6fd1bd
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri May 29 22:37:59 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Mon Jul 6 01:37:18 2015 +0200
cmListFileBacktrace: Implement in terms of cmState::Snapshot.
Avoid copying many strings into each backtrace object.
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index cdf278c..20448c1 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -115,10 +115,7 @@ IsFunctionBlocked(const cmListFileFunction lff,
{
std::string err = cmIfCommandError(expandedArguments);
err += errorString;
- cmListFileContext lfc =
- cmListFileContext::FromCommandContext(
-this-Functions[c], this-GetStartingContext().FilePath);
- cmListFileBacktrace bt = mf.GetBacktrace(lfc);
+ cmListFileBacktrace bt = mf.GetBacktrace(this-Functions[c]);
mf.GetCMakeInstance()-IssueMessage(messType, err, bt);
if (messType == cmake::FATAL_ERROR)
{
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 9141d88..1097dc2 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -398,40 +398,50 @@ bool cmListFileParser::AddArgument(cmListFileLexer_Token*
token,
}
}
-void cmListFileBacktrace::Append(cmListFileContext const context)
-{
- this-push_back(context);
-}
-
void cmListFileBacktrace::PrintTitle(std::ostream out)
{
- if (this-empty())
+ if (!this-Snapshot.IsValid())
{
return;
}
-
cmOutputConverter converter(this-Snapshot);
- cmListFileContext lfc = this-front();
+ cmListFileContext lfc =
+ cmListFileContext::FromCommandContext(
+this-Context, this-Snapshot.GetExecutionListFile());
lfc.FilePath = converter.Convert(lfc.FilePath, cmOutputConverter::HOME);
out (lfc.Line ? at : in ) lfc;
}
void cmListFileBacktrace::PrintCallStack(std::ostream out)
{
- if (size() = 1)
+ if (!this-Snapshot.IsValid())
+{
+return;
+}
+ cmState::Snapshot parent = this-Snapshot.GetCallStackParent();
+ if (!parent.IsValid() || parent.GetExecutionListFile().empty())
{
return;
}
cmOutputConverter converter(this-Snapshot);
- const_iterator i = this-begin() + 1;
+ std::string commandName =
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-828-gad034c4
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 ad034c4a97a777f7a2f42a35110599b4fd99ac9c (commit)
via 9c323873a433cab7b90616cee08eb4374cc1a54f (commit)
via 4551b90e7395e2c4e5680c8101ac494b7c7ab77e (commit)
via 0eb70376014b73c4970489c49000fcc6e46478cb (commit)
via b64c894238344222acf7292718d699fa420324db (commit)
via 5af7740bd25582cb03bbda81c8badc47c98e325b (commit)
from 30c71d915bf2feb6a37791f840f6519ebcf624d8 (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=ad034c4a97a777f7a2f42a35110599b4fd99ac9c
commit ad034c4a97a777f7a2f42a35110599b4fd99ac9c
Merge: 30c71d9 9c32387
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Sun Jul 5 20:12:02 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Jul 5 20:12:02 2015 -0400
Merge topic 'refactor-cmListFileBacktrace' into next
9c323873 cmListFileBacktrace: Implement in terms of cmState::Snapshot.
4551b90e cmListFile: Remove FilePath member from cmListFileContext.
0eb70376 cmMakefile: Set the FilePath on the frame from the cmState.
b64c8942 cmMakefile: Create intermediate variables for snapshot frames.
5af7740b cmMakefile: Create a scoped context for parsing listfiles.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c323873a433cab7b90616cee08eb4374cc1a54f
commit 9c323873a433cab7b90616cee08eb4374cc1a54f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri May 29 22:37:59 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Mon Jul 6 02:11:51 2015 +0200
cmListFileBacktrace: Implement in terms of cmState::Snapshot.
Avoid copying many strings into each backtrace object.
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index cdf278c..20448c1 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -115,10 +115,7 @@ IsFunctionBlocked(const cmListFileFunction lff,
{
std::string err = cmIfCommandError(expandedArguments);
err += errorString;
- cmListFileContext lfc =
- cmListFileContext::FromCommandContext(
-this-Functions[c], this-GetStartingContext().FilePath);
- cmListFileBacktrace bt = mf.GetBacktrace(lfc);
+ cmListFileBacktrace bt = mf.GetBacktrace(this-Functions[c]);
mf.GetCMakeInstance()-IssueMessage(messType, err, bt);
if (messType == cmake::FATAL_ERROR)
{
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 9141d88..1097dc2 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -398,40 +398,50 @@ bool cmListFileParser::AddArgument(cmListFileLexer_Token*
token,
}
}
-void cmListFileBacktrace::Append(cmListFileContext const context)
-{
- this-push_back(context);
-}
-
void cmListFileBacktrace::PrintTitle(std::ostream out)
{
- if (this-empty())
+ if (!this-Snapshot.IsValid())
{
return;
}
-
cmOutputConverter converter(this-Snapshot);
- cmListFileContext lfc = this-front();
+ cmListFileContext lfc =
+ cmListFileContext::FromCommandContext(
+this-Context, this-Snapshot.GetExecutionListFile());
lfc.FilePath = converter.Convert(lfc.FilePath, cmOutputConverter::HOME);
out (lfc.Line ? at : in ) lfc;
}
void cmListFileBacktrace::PrintCallStack(std::ostream out)
{
- if (size() = 1)
+ if (!this-Snapshot.IsValid())
+{
+return;
+}
+ cmState::Snapshot parent = this-Snapshot.GetCallStackParent();
+ if (!parent.IsValid() || parent.GetExecutionListFile().empty())
{
return;
}
cmOutputConverter converter(this-Snapshot);
- const_iterator i = this-begin() + 1;
+ std::string commandName = this-Snapshot.GetEntryPointCommand();
+ long commandLine = this-Snapshot.GetEntryPointLine();
+
out Call Stack (most recent call first):\n;
- while(i != this-end())
+ while(parent.IsValid())
{
-cmListFileContext lfc = *i;
-lfc.FilePath = converter.Convert(lfc.FilePath, cmOutputConverter::HOME);
+cmListFileContext lfc;
+lfc.Name = commandName;
+lfc.Line = commandLine;
+
+lfc.FilePath = converter.Convert(parent.GetExecutionListFile(),
+ cmOutputConverter::HOME);
out lfc \n;
-++i;
+
+commandName = parent.GetEntryPointCommand();
+commandLine = parent.GetEntryPointLine();
+parent = parent.GetCallStackParent();
}
}
diff --git a/Source/cmListFileCache.h b/Source/cmListFileCache.h
index 57bf253..aa8a34c 100644
--- a/Source/cmListFileCache.h
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-822-g30c71d9
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 30c71d915bf2feb6a37791f840f6519ebcf624d8 (commit)
via 83e53b7d4799ee8cbbff834321c6a0d8fb869267 (commit)
from 1965936bb20f40951a1ee597769e4b92e3ae7713 (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=30c71d915bf2feb6a37791f840f6519ebcf624d8
commit 30c71d915bf2feb6a37791f840f6519ebcf624d8
Merge: 1965936 83e53b7
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Sun Jul 5 20:11:41 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Jul 5 20:11:41 2015 -0400
Merge topic 'refactor-cmListFileBacktrace' into next
83e53b7d fixup! cmMakefile: Create a scoped context for parsing listfiles.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83e53b7d4799ee8cbbff834321c6a0d8fb869267
commit 83e53b7d4799ee8cbbff834321c6a0d8fb869267
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Jul 6 02:11:18 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Mon Jul 6 02:11:18 2015 +0200
fixup! cmMakefile: Create a scoped context for parsing listfiles.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 355c40f..94c77e1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -541,8 +541,9 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
}
}
-struct cmParseFileScope
+class cmParseFileScope
{
+public:
cmParseFileScope(cmMakefile* mf)
: Makefile(mf)
{
---
Summary of changes:
Source/cmMakefile.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.3.0-rc3-323-gd1db123
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 d1db123e1c3eeba3fcc27b8ae2f65c7ae8f91a7f (commit) from 4127a638b053940171b2619be0534a32353dae03 (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=d1db123e1c3eeba3fcc27b8ae2f65c7ae8f91a7f commit d1db123e1c3eeba3fcc27b8ae2f65c7ae8f91a7f Author: Kitware Robot kwro...@kitware.com AuthorDate: Mon Jul 6 00:01:04 2015 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Mon Jul 6 00:01:04 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 160936f..fd23b92 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 3) -set(CMake_VERSION_PATCH 20150705) +set(CMake_VERSION_PATCH 20150706) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
