[Cmake-commits] CMake branch, next, updated. v2.8.7-3132-g0e31245
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 0e3124564216e0a80530a6daca009620834062d4 (commit)
via c7da50da52debd980ec1232dfc2e91b7162f5c84 (commit)
from 1abdfd64cedc84ab18c8f57b2d317e3a23cd35aa (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=0e3124564216e0a80530a6daca009620834062d4
commit 0e3124564216e0a80530a6daca009620834062d4
Merge: 1abdfd6 c7da50d
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Mar 9 08:02:49 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 9 08:02:49 2012 -0500
Merge topic 'ctest-clang-in-xcode' into next
c7da50d CTest: Detect Xcode error Command ... failed with exit code
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7da50da52debd980ec1232dfc2e91b7162f5c84
commit c7da50da52debd980ec1232dfc2e91b7162f5c84
Author: Alexandru Ciobanu a...@rogue-research.com
AuthorDate: Thu Mar 8 18:32:12 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Mar 9 07:59:56 2012 -0500
CTest: Detect Xcode error Command ... failed with exit code
diff --git a/Source/CTest/cmCTestBuildHandler.cxx
b/Source/CTest/cmCTestBuildHandler.cxx
index 34a3e60..27bb06c 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -94,6 +94,7 @@ static const char* cmCTestErrorMatches[] = {
: Invalid argument,
^The project cannot be built\\.,
^\\[ERROR\\],
+ ^Command .* failed with exit code,
0
};
---
Summary of changes:
Source/CTest/cmCTestBuildHandler.cxx |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, next, updated. v2.8.7-3134-g778708b
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 778708b0459006b8c3fc1492430a2ada82f152cd (commit) via ea4416cf7bca8b3123a5b26d159f7164d727a8e6 (commit) from 0e3124564216e0a80530a6daca009620834062d4 (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=778708b0459006b8c3fc1492430a2ada82f152cd commit 778708b0459006b8c3fc1492430a2ada82f152cd Merge: 0e31245 ea4416c Author: Brad King brad.k...@kitware.com AuthorDate: Fri Mar 9 09:36:03 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 9 09:36:03 2012 -0500 Merge topic 'ctest-match-valgrind' into next ea4416c CTest: Match valgrind errors with points to (#12922) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea4416cf7bca8b3123a5b26d159f7164d727a8e6 commit ea4416cf7bca8b3123a5b26d159f7164d727a8e6 Author: Alexandru Ciobanu a...@rogue-research.com AuthorDate: Sun Feb 12 23:26:05 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Mar 9 09:32:28 2012 -0500 CTest: Match valgrind errors with points to (#12922) Teach CTest to match valgrind errors of the format Syscall param ... points to uninitialised byte(s). diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index f0a98f9..035aaa9 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -679,7 +679,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput( bytes in [0-9,]+ blocks are definitely lost in loss record [0-9,]+ of [0-9,]+); cmsys::RegularExpression vgPAR( -== .*Syscall param .* contains unaddressable byte\\(s\\)); +== .*Syscall param .* (contains|points to) unaddressable byte\\(s\\)); cmsys::RegularExpression vgMPK1( == .*[0-9,]+ bytes in [0-9,]+ blocks are possibly lost in loss record [0-9,]+ of [0-9,]+); --- Summary of changes: Source/CTest/cmCTestMemCheckHandler.cxx |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.7-3137-gc5d6d48
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 c5d6d48e1085d8ebe354a2260006181e4d301036 (commit)
via 05a76d53c0ff99f698760080c2fbde7f1e47cf7a (commit)
via c7bdef5b48fe74f92d75f538e702257e7de1a998 (commit)
from 778708b0459006b8c3fc1492430a2ada82f152cd (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=c5d6d48e1085d8ebe354a2260006181e4d301036
commit c5d6d48e1085d8ebe354a2260006181e4d301036
Merge: 778708b 05a76d5
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Mar 9 13:05:08 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 9 13:05:08 2012 -0500
Merge topic 'fix-cpack-hdiutil-retry-loops' into next
05a76d5 CPack: Fix retry logic when calls to hdiutil fail
c7bdef5 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05a76d53c0ff99f698760080c2fbde7f1e47cf7a
commit 05a76d53c0ff99f698760080c2fbde7f1e47cf7a
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Mar 9 11:39:01 2012 -0500
Commit: David Cole david.c...@kitware.com
CommitDate: Fri Mar 9 11:39:01 2012 -0500
CPack: Fix retry logic when calls to hdiutil fail
The long-standing sporadic failures of CPack tests on the Mac dashboards
are caused by an occasional problem running hdiutil. To compensate for
this, a retry loop was added in the code in a previous commit: a9fa71a4
... but the logic for breaking out of the retry loop was flawed, breaking
out of the loop (and not retrying) when the hdiutil command returns an
error instead of when it returns success.
This commit fixes the flawed logic, bumps up the number of retries from
4 to 10, and adds a half-second delay in between retries.
The delay is specifically added in case a virus checker or spotlight indexer
is temporarily causing the hdiutil failure by hanging onto a newly created
file longer than hdiutil expects it to.
As with all sporadically occurring issues, we'll never know if this is
really fixed all the way. But I'll be happy even if we can only get it to
happen just a bit less often.
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx
b/Source/CPack/cmCPackOSXX11Generator.cxx
index 75ad640..363ccea 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -170,23 +170,25 @@ int cmCPackOSXX11Generator::PackageFiles()
\ create -ov -format UDZO -srcfolder \
diskImageDirectory.c_str()
\ \ packageFileNames[0] \;
- int retVal = 1;
cmCPackLogger(cmCPackLog::LOG_VERBOSE,
Compress disk image using command:
dmgCmd.str().c_str() std::endl);
// since we get random dashboard failures with this one
// try running it more than once
- int numTries = 4;
+ int retVal = 1;
+ int numTries = 10;
bool res = false;
while(numTries 0)
{
res = cmSystemTools::RunSingleCommand(dmgCmd.str().c_str(), output,
retVal, 0,
this-GeneratorVerbose, 0);
-if(res retVal)
+if ( res !retVal )
{
numTries = -1;
+ break;
}
+cmSystemTools::Delay(500);
numTries--;
}
if ( !res || retVal )
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx
b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 0c4b1a6..327c4a6 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -319,17 +319,19 @@ int cmCPackPackageMakerGenerator::PackageFiles()
\ \ packageFileNames[0] \;
std::string output;
int retVal = 1;
- int numTries = 4;
+ int numTries = 10;
bool res = false;
while(numTries 0)
{
res = cmSystemTools::RunSingleCommand(dmgCmd.str().c_str(), output,
retVal, 0, this-GeneratorVerbose,
0);
-if(res retVal)
+if ( res !retVal )
{
numTries = -1;
+ break;
}
+cmSystemTools::Delay(500);
numTries--;
}
if ( !res || retVal )
---
Summary of changes:
Source/CPack/cmCPackOSXX11Generator.cxx |8 +---
Source/CPack/cmCPackPackageMakerGenerator.cxx |6 --
Source/kwsys/kwsysDateStamp.cmake |2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
[Cmake-commits] CMake branch, next, updated. v2.8.7-3139-g6dc37e9
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 6dc37e91431b70c6f4ee55744b26eb103ee067f1 (commit)
via d2d492f492a8a6082345e439a9c15418f0d483db (commit)
from c5d6d48e1085d8ebe354a2260006181e4d301036 (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=6dc37e91431b70c6f4ee55744b26eb103ee067f1
commit 6dc37e91431b70c6f4ee55744b26eb103ee067f1
Merge: c5d6d48 d2d492f
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Fri Mar 9 14:36:43 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 9 14:36:43 2012 -0500
Merge topic 'ninja-generator' into next
d2d492f Add a cache option CMAKE_ENABLE_NINJA to enable the ninja generator.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2d492f492a8a6082345e439a9c15418f0d483db
commit d2d492f492a8a6082345e439a9c15418f0d483db
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Fri Mar 9 14:28:21 2012 -0500
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Fri Mar 9 14:28:21 2012 -0500
Add a cache option CMAKE_ENABLE_NINJA to enable the ninja generator.
Make the option default to on, for platforms where CMake passes
all tests with the ninja generator. This is currently only Linux.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index eb4327c..18f9b8b 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -353,7 +353,18 @@ IF (WIN32)
ENDIF(NOT UNIX)
ENDIF (WIN32)
-if(NOT WIN32)
+# turn on Ninja by default
+set(_CMAKE_DEFAULT_NINJA_VALUE TRUE)
+# turn it off for platforms where it does not pass all the
+# tests
+if(WIN32 OR APPLE)
+ SET(_CMAKE_DEFAULT_NINJA_VALUE FALSE)
+endif()
+SET(CMAKE_ENABLE_NINJA ${_CMAKE_DEFAULT_NINJA_VALUE} CACHE BOOL
+Enable the ninja generator for CMake. currently not fully working for
Windows or OSX)
+MARK_AS_ADVANCED(CMAKE_ENABLE_NINJA)
+IF(CMAKE_ENABLE_NINJA)
+ MESSAGE(STATUS Enable ninja generator.)
SET(SRCS ${SRCS}
cmGlobalNinjaGenerator.cxx
cmGlobalNinjaGenerator.h
@@ -368,7 +379,9 @@ if(NOT WIN32)
cmNinjaUtilityTargetGenerator.h
)
ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
-endif()
+ELSE()
+ MESSAGE(STATUS Disable ninja generator.)
+ENDIF()
# create a library used by the command line and the GUI
ADD_LIBRARY(CMakeLib ${SRCS})
---
Summary of changes:
Source/CMakeLists.txt | 17 +++--
1 files changed, 15 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.7-3143-gc8e9707
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 c8e97077314e1983b4e3e962da366947a8c9ab61 (commit)
via 0996f2a228a834d75ba9845ea6b899b60eb84712 (commit)
via 67734be8cf4cb7fa1c29ec62a19ef04dd898a08c (commit)
via 4ae7f3656b6ebe7c878716b95ef5eb3d924d4173 (commit)
from 6dc37e91431b70c6f4ee55744b26eb103ee067f1 (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=c8e97077314e1983b4e3e962da366947a8c9ab61
commit c8e97077314e1983b4e3e962da366947a8c9ab61
Merge: 6dc37e9 0996f2a
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Mar 9 15:14:02 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 9 15:14:02 2012 -0500
Merge topic 'cleanup-object-file-names' into next
0996f2a Hide Makefile local object info inside local generator
67734be VS: Simplify object name computation
4ae7f36 Remove unused partial OBJECT_FILES property implementation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0996f2a228a834d75ba9845ea6b899b60eb84712
commit 0996f2a228a834d75ba9845ea6b899b60eb84712
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 6 14:42:40 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Mar 8 07:58:52 2012 -0500
Hide Makefile local object info inside local generator
Make cmLocalUnixMakefileGenerator3::LocalObjectInfo private and add
cmLocalUnixMakefileGenerator3::AddLocalObjectFile to create entries.
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index 5cc4e1c..d032a93 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -145,6 +145,20 @@ void cmLocalUnixMakefileGenerator3::Generate()
}
//
+void cmLocalUnixMakefileGenerator3::AddLocalObjectFile(
+ cmTarget* target, cmSourceFile* sf, std::string objNoTargetDir,
+ bool hasSourceExtension)
+{
+ if(cmSystemTools::FileIsFullPath(objNoTargetDir.c_str()))
+{
+objNoTargetDir = cmSystemTools::GetFilenameName(objNoTargetDir);
+}
+ LocalObjectInfo info = this-LocalObjectFiles[objNoTargetDir];
+ info.HasSourceExtension = hasSourceExtension;
+ info.push_back(LocalObjectEntry(target, sf-GetLanguage()));
+}
+
+//
void cmLocalUnixMakefileGenerator3::GetIndividualFileTargets
(std::vectorstd::string targets)
{
diff --git a/Source/cmLocalUnixMakefileGenerator3.h
b/Source/cmLocalUnixMakefileGenerator3.h
index 4754f11..4bde082 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -225,24 +225,9 @@ public:
// write the target rules for the local Makefile into the stream
void WriteLocalAllRules(std::ostream ruleFileStream);
- struct LocalObjectEntry
- {
-cmTarget* Target;
-std::string Language;
-LocalObjectEntry(): Target(0), Language() {}
-LocalObjectEntry(cmTarget* t, const char* lang):
- Target(t), Language(lang) {}
- };
- struct LocalObjectInfo: public std::vectorLocalObjectEntry
- {
-bool HasSourceExtension;
-bool HasPreprocessRule;
-bool HasAssembleRule;
-LocalObjectInfo():HasSourceExtension(false), HasPreprocessRule(false),
- HasAssembleRule(false) {}
- };
- std::mapcmStdString, LocalObjectInfo const GetLocalObjectFiles()
-{ return this-LocalObjectFiles;}
+ void AddLocalObjectFile(cmTarget* target, cmSourceFile* sf,
+ std::string objNoTargetDir,
+ bool hasSourceExtension);
std::vectorcmStdString const GetLocalHelp() { return this-LocalHelp; }
@@ -298,9 +283,6 @@ protected:
void WriteTargetRequiresRule(std::ostream ruleFileStream,
cmTarget target,
const std::vectorstd::string objects);
- void WriteObjectConvenienceRule(std::ostream ruleFileStream,
- const char* comment, const char* output,
- LocalObjectInfo const info);
std::string GetObjectFileName(cmTarget target,
const cmSourceFile source,
@@ -375,7 +357,27 @@ private:
bool SkipPreprocessedSourceRules;
bool SkipAssemblySourceRules;
+ struct LocalObjectEntry
+ {
+cmTarget* Target;
+std::string Language;
+LocalObjectEntry(): Target(0), Language() {}
+LocalObjectEntry(cmTarget* t, const char* lang):
+
[Cmake-commits] CMake branch, next, updated. v2.8.7-3145-g0a505f3
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 0a505f3f05dab1582d9a09fccc1855587044eb72 (commit)
via 15754a55688b1f51dd0200551a84c772ce598f39 (commit)
from c8e97077314e1983b4e3e962da366947a8c9ab61 (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=0a505f3f05dab1582d9a09fccc1855587044eb72
commit 0a505f3f05dab1582d9a09fccc1855587044eb72
Merge: c8e9707 15754a5
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Mar 9 15:29:48 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 9 15:29:48 2012 -0500
Merge topic 'update-KWIML' into next
15754a5 KWIML: Fix test_INT_format typo
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15754a55688b1f51dd0200551a84c772ce598f39
commit 15754a55688b1f51dd0200551a84c772ce598f39
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Mar 9 15:27:35 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Mar 9 15:27:35 2012 -0500
KWIML: Fix test_INT_format typo
Do not print @KWIML@_INT_ twice.
diff --git a/Utilities/KWIML/test/test_INT_format.h.in
b/Utilities/KWIML/test/test_INT_format.h.in
index feca446..a8ea263 100644
--- a/Utilities/KWIML/test/test_INT_format.h.in
+++ b/Utilities/KWIML/test/test_INT_format.h.in
@@ -24,7 +24,7 @@
{ \
T const x = VALUE(T, U); \
T y = C(V); \
- printf(LANG @KWIML@_INT_ #C : \
+ printf(LANG #C :\
expression [%@KWIML@_INT_PRI##PRI], \
literal [%@KWIML@_INT_PRI##PRI], x, y); \
if(x == y)\
---
Summary of changes:
Utilities/KWIML/test/test_INT_format.h.in |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.7-3148-gab8fc0f
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 ab8fc0f1e52eb47d7d1443e2ca2bed9e01daa61c (commit)
via 289e5e6012053a356d6a7b9a9351c4b4127a50d9 (commit)
via f94ae0ecdac2fd8e8d68dde7dd16550bdee0493d (commit)
from 0a505f3f05dab1582d9a09fccc1855587044eb72 (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=ab8fc0f1e52eb47d7d1443e2ca2bed9e01daa61c
commit ab8fc0f1e52eb47d7d1443e2ca2bed9e01daa61c
Merge: 0a505f3 289e5e6
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Mar 9 15:30:17 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 9 15:30:17 2012 -0500
Merge topic 'update-KWIML' into next
289e5e6 Merge branch 'upstream-kwiml' into update-KWIML
f94ae0e KWIML: Make test_INT robust to #define-d int#_t and INT#_C
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=289e5e6012053a356d6a7b9a9351c4b4127a50d9
commit 289e5e6012053a356d6a7b9a9351c4b4127a50d9
Merge: 285f0db f94ae0e
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Mar 9 15:28:40 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Mar 9 15:28:40 2012 -0500
Merge branch 'upstream-kwiml' into update-KWIML
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f94ae0ecdac2fd8e8d68dde7dd16550bdee0493d
commit f94ae0ecdac2fd8e8d68dde7dd16550bdee0493d
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Mar 7 16:05:17 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Mar 9 15:26:26 2012 -0500
KWIML: Make test_INT robust to #define-d int#_t and INT#_C
Our TEST* macro calls pass arguments such as int64_t with the
expectation that the preprocessing token will be used literally.
Some platforms #define int64_t as long long which is not a valid
preprocessing token. Perform preprocessor symbol concatenation
on the type names at the first level of macro evaluation to avoid
expanding the names.
diff --git a/test/test_INT_format.h.in b/test/test_INT_format.h.in
index 72a62f2..a8ea263 100644
--- a/test/test_INT_format.h.in
+++ b/test/test_INT_format.h.in
@@ -18,15 +18,13 @@
# define LANG C
#endif
-#define VALUE(T, U) \
-(@KWIML@_INT_##T)((@KWIML@_INT_##U)0xab \
-((sizeof(@KWIML@_INT_##T)-1)3)) \
+#define VALUE(T, U) (T)((U)0xab ((sizeof(T)-1)3))
-#define TEST_C(C, V, PRI, T, U) \
+#define TEST_C_(C, V, PRI, T, U)\
{ \
- @KWIML@_INT_##T const x = VALUE(T, U);\
- @KWIML@_INT_##T y = @KWIML@_INT_##C(V); \
- printf(LANG @KWIML@_INT_ #C : \
+ T const x = VALUE(T, U); \
+ T y = C(V); \
+ printf(LANG #C :\
expression [%@KWIML@_INT_PRI##PRI], \
literal [%@KWIML@_INT_PRI##PRI], x, y); \
if(x == y)\
@@ -40,9 +38,9 @@
} \
}
-#define TEST_PRI(PRI, T, U, STR)\
+#define TEST_PRI_(PRI, T, U, STR) \
{ \
- @KWIML@_INT_##T const x = VALUE(T, U);\
+ T const x = VALUE(T, U); \
char const* str = STR;\
sprintf(buf, %@KWIML@_INT_PRI##PRI, x); \
printf(LANG @KWIML@_INT_PRI #PRI :\
@@ -58,11 +56,11 @@
} \
}
-#define TEST_SCN(SCN, T, U, STR) TEST_SCN2(SCN, SCN, T, U, STR)
-#define TEST_SCN2(PRI, SCN, T, U, STR) \
+#define TEST_SCN_(SCN, T, U, STR) TEST_SCN2_(SCN, SCN, T, U, STR)
+#define TEST_SCN2_(PRI, SCN, T, U, STR) \
{ \
- @KWIML@_INT_##T const x = VALUE(T, U);\
- @KWIML@_INT_##T y;
[Cmake-commits] CMake branch, master, updated. v2.8.7-635-g71c16e4
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 71c16e457c795bc6635515f026c5f9f8d952b59d (commit) from c7bdef5b48fe74f92d75f538e702257e7de1a998 (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=71c16e457c795bc6635515f026c5f9f8d952b59d commit 71c16e457c795bc6635515f026c5f9f8d952b59d Author: KWSys Robot kwro...@kitware.com AuthorDate: Sat Mar 10 00:01:03 2012 -0500 Commit: KWSys Robot kwro...@kitware.com CommitDate: Sat Mar 10 00:05:06 2012 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index b00f782..a0694e8 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2012) SET(KWSYS_DATE_STAMP_MONTH 03) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 09) +SET(KWSYS_DATE_STAMP_DAY 10) --- Summary of changes: Source/kwsys/kwsysDateStamp.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
