[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6200-gb692db5
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 b692db5561a0cbecfacfcc468b70b9798016ade7 (commit)
via 5e96322fcf2808e2e68e15ab7a5b23b612ca269a (commit)
from 58a99f40bb9ee6cc5cb0b85b700733cc14cc3788 (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=b692db5561a0cbecfacfcc468b70b9798016ade7
commit b692db5561a0cbecfacfcc468b70b9798016ade7
Merge: 58a99f4 5e96322
Author: Stephen Kelly
AuthorDate: Thu Dec 12 06:54:02 2013 -0500
Commit: CMake Topic Stage
CommitDate: Thu Dec 12 06:54:02 2013 -0500
Merge topic 'GenerateExportHeader-tests' into next
5e96322 Maybe fix MSVC6.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e96322fcf2808e2e68e15ab7a5b23b612ca269a
commit 5e96322fcf2808e2e68e15ab7a5b23b612ca269a
Author: Stephen Kelly
AuthorDate: Thu Dec 12 12:51:13 2013 +0100
Commit: Stephen Kelly
CommitDate: Thu Dec 12 12:53:21 2013 +0100
Maybe fix MSVC6.
diff --git a/Tests/Module/GenerateExportHeader/exportheader_test.cpp
b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
index e5f30fa..146374a 100644
--- a/Tests/Module/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
@@ -13,7 +13,7 @@
#include
#include
-#include
+#include
#include
void compare(const char* refName, const char* testName)
@@ -23,7 +23,7 @@ void compare(const char* refName, const char* testName)
if (!ref.is_open())
{
std::cout << "Could not open \"" << refName << "\"." << std::endl;
-std::exit(1);
+exit(1);
}
std::ifstream test;
test.open(testName);
---
Summary of changes:
.../GenerateExportHeader/exportheader_test.cpp |4 ++--
1 files changed, 2 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.1-6202-g6da6fa0
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 6da6fa0023c4aa0a93a6d073bd13c7f343684126 (commit)
via 3e97bcb1ef18c7b1e16f81733896764bfd8178aa (commit)
from b692db5561a0cbecfacfcc468b70b9798016ade7 (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=6da6fa0023c4aa0a93a6d073bd13c7f343684126
commit 6da6fa0023c4aa0a93a6d073bd13c7f343684126
Merge: b692db5 3e97bcb
Author: Stephen Kelly
AuthorDate: Thu Dec 12 12:23:01 2013 -0500
Commit: CMake Topic Stage
CommitDate: Thu Dec 12 12:23:01 2013 -0500
Merge topic 'Qt4-NO_DEBUG-define' into next
3e97bcb Use a config-specific moc parameters file, if needed.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e97bcb1ef18c7b1e16f81733896764bfd8178aa
commit 3e97bcb1ef18c7b1e16f81733896764bfd8178aa
Author: Stephen Kelly
AuthorDate: Thu Dec 12 18:22:17 2013 +0100
Commit: Stephen Kelly
CommitDate: Thu Dec 12 18:22:17 2013 +0100
Use a config-specific moc parameters file, if needed.
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index b5f005f..fd9819f 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -120,6 +120,7 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags
moc_options moc_target)
string (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
if(moc_target)
+set (_moc_parameters_file
${_moc_parameters_file}$<$>:_$>)
set(targetincludes "$")
set(targetdefines "$")
---
Summary of changes:
Modules/Qt4Macros.cmake |1 +
1 files changed, 1 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.1-908-g5e43d6d
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 5e43d6d3d0285901af816ab1ed37563ea00eaf21 (commit) from edaef237bf90b5e6af095883370d0f490d13c844 (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=5e43d6d3d0285901af816ab1ed37563ea00eaf21 commit 5e43d6d3d0285901af816ab1ed37563ea00eaf21 Author: Kitware Robot AuthorDate: Fri Dec 13 00:01:07 2013 -0500 Commit: Kitware Robot CommitDate: Fri Dec 13 00:01:07 2013 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7943fb7..8ae87ef 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 20131212) +set(CMake_VERSION_TWEAK 20131213) #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
