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 1be22978e0ec3766c457216af348c8dca4d7cca2 (commit)
via e9237334a6beab7090cc702ca8d4e0914f5bfe07 (commit)
via 8a53242df98be391070d7a34590e127c28e2e985 (commit)
via 6e921648d292c81f2d0e62803f45a4f79aa892ca (commit)
via 2c1ecab64da6a8c7738770316ddf8a72bbf8eb1f (commit)
from 89ec1aacd781dcaf4aa0c6899bface518ac6afca (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1be22978e0ec3766c457216af348c8dca4d7cca2
commit 1be22978e0ec3766c457216af348c8dca4d7cca2
Merge: e923733 2c1ecab
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 10 15:34:09 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jan 10 10:34:24 2018 -0500
Merge topic 'serverTestInfoExpandVariables'
2c1ecab6 server: Expand generator expressions for test info
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1633
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9237334a6beab7090cc702ca8d4e0914f5bfe07
commit e9237334a6beab7090cc702ca8d4e0914f5bfe07
Merge: 89ec1aa 8a53242
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 10 15:32:08 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jan 10 10:32:16 2018 -0500
Merge topic 'update-kwiml'
8a53242d Merge branch 'upstream-KWIML' into update-kwiml
6e921648 KWIML 2018-01-09 (9c2d6cae)
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1636
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a53242df98be391070d7a34590e127c28e2e985
commit 8a53242df98be391070d7a34590e127c28e2e985
Merge: 2c089d8 6e92164
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 9 08:51:59 2018 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 9 08:51:59 2018 -0500
Merge branch 'upstream-KWIML' into update-kwiml
* upstream-KWIML:
KWIML 2018-01-09 (9c2d6cae)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e921648d292c81f2d0e62803f45a4f79aa892ca
commit 6e921648d292c81f2d0e62803f45a4f79aa892ca
Author: KWIML Upstream <kwro...@kitware.com>
AuthorDate: Tue Jan 9 08:49:07 2018 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 9 08:51:58 2018 -0500
KWIML 2018-01-09 (9c2d6cae)
Code extracted from:
https://gitlab.kitware.com/utils/kwiml.git
at commit 9c2d6caecd8cd937b891009c681f90748df85dfd (master).
Upstream Shortlog
-----------------
Brad King (5):
fc9d607a Use static_cast when compiling as C++
ea9336bc Update copyright year
7db8b884 Suppress MSVC static_cast warnings in verification and test
code
340af24d Update copyright year
9c2d6cae Fix compilation on Borland C++ 5.8
Richard W.M. Jones (1):
6fc81d88 abi.h: Update RISC-V support for revised macro names
diff --git a/Copyright.txt b/Copyright.txt
index 515c4eb..fffd6d1 100644
--- a/Copyright.txt
+++ b/Copyright.txt
@@ -1,5 +1,5 @@
Kitware Information Macro Library
-Copyright 2010-2016 Kitware, Inc.
+Copyright 2010-2018 Kitware, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/include/kwiml/abi.h b/include/kwiml/abi.h
index 5ffd542..da525fd 100644
--- a/include/kwiml/abi.h
+++ b/include/kwiml/abi.h
@@ -1,6 +1,6 @@
/*============================================================================
Kitware Information Macro Library
- Copyright 2010-2016 Kitware, Inc.
+ Copyright 2010-2018 Kitware, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -468,7 +468,7 @@ suppression macro KWIML_ABI_NO_VERIFY was defined.
# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE
/* RISC-V */
-#elif defined(__riscv__)
+#elif defined(__riscv) || defined(__riscv__)
# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE
/* Unknown CPU */
@@ -484,9 +484,16 @@ suppression macro KWIML_ABI_NO_VERIFY was defined.
#if defined(_MSC_VER)
# pragma warning (push)
+# pragma warning (disable:4309) /* static_cast trunction of constant value */
# pragma warning (disable:4310) /* cast truncates constant value */
#endif
+#if defined(__cplusplus) && !defined(__BORLANDC__)
+#define KWIML_ABI_private_STATIC_CAST(t,v) static_cast<t>(v)
+#else
+#define KWIML_ABI_private_STATIC_CAST(t,v) (t)(v)
+#endif
+
#define KWIML_ABI_private_VERIFY(n, x, y)
KWIML_ABI_private_VERIFY_0(KWIML_ABI_private_VERSION, n, x, y)
#define KWIML_ABI_private_VERIFY_0(V, n, x, y) KWIML_ABI_private_VERIFY_1(V,
n, x, y)
#define KWIML_ABI_private_VERIFY_1(V, n, x, y) extern int (*n##_v##V)[x];
extern int (*n##_v##V)[y]
@@ -535,9 +542,11 @@
KWIML_ABI_private_VERIFY_DIFF(KWIML_ABI___INT64_NOT_LONG_LONG, __int64, long lon
#endif
#if defined(KWIML_ABI_CHAR_IS_UNSIGNED)
-KWIML_ABI_private_VERIFY_BOOL(KWIML_ABI_CHAR_IS_UNSIGNED, (char)0x80 > 0);
+KWIML_ABI_private_VERIFY_BOOL(KWIML_ABI_CHAR_IS_UNSIGNED,
+ KWIML_ABI_private_STATIC_CAST(char, 0x80) > 0);
#elif defined(KWIML_ABI_CHAR_IS_SIGNED)
-KWIML_ABI_private_VERIFY_BOOL(KWIML_ABI_CHAR_IS_SIGNED, (char)0x80 < 0);
+KWIML_ABI_private_VERIFY_BOOL(KWIML_ABI_CHAR_IS_SIGNED,
+ KWIML_ABI_private_STATIC_CAST(char, 0x80) < 0);
#endif
#undef KWIML_ABI_private_VERIFY_DIFF
@@ -557,6 +566,8 @@ KWIML_ABI_private_VERIFY_BOOL(KWIML_ABI_CHAR_IS_SIGNED,
(char)0x80 < 0);
#undef KWIML_ABI_private_VERIFY_0
#undef KWIML_ABI_private_VERIFY
+#undef KWIML_ABI_private_STATIC_CAST
+
#if defined(_MSC_VER)
# pragma warning (pop)
#endif
diff --git a/include/kwiml/int.h b/include/kwiml/int.h
index 489c603..b2e14d5 100644
--- a/include/kwiml/int.h
+++ b/include/kwiml/int.h
@@ -1,6 +1,6 @@
/*============================================================================
Kitware Information Macro Library
- Copyright 2010-2016 Kitware, Inc.
+ Copyright 2010-2018 Kitware, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -1003,16 +1003,25 @@ An includer may test the following macros after
inclusion:
#if defined(_MSC_VER)
# pragma warning (push)
+# pragma warning (disable:4309) /* static_cast trunction of constant value */
# pragma warning (disable:4310) /* cast truncates constant value */
#endif
+#if defined(__cplusplus) && !defined(__BORLANDC__)
+#define KWIML_INT_private_STATIC_CAST(t,v) static_cast<t>(v)
+#else
+#define KWIML_INT_private_STATIC_CAST(t,v) (t)(v)
+#endif
+
#define KWIML_INT_private_VERIFY(n, x, y)
KWIML_INT_private_VERIFY_0(KWIML_INT_private_VERSION, n, x, y)
#define KWIML_INT_private_VERIFY_0(V, n, x, y) KWIML_INT_private_VERIFY_1(V,
n, x, y)
#define KWIML_INT_private_VERIFY_1(V, n, x, y) extern int (*n##_v##V)[x];
extern int (*n##_v##V)[y]
#define KWIML_INT_private_VERIFY_BOOL(m, b)
KWIML_INT_private_VERIFY(KWIML_INT_detail_VERIFY_##m, 2, (b)?2:3)
#define KWIML_INT_private_VERIFY_TYPE(t, s)
KWIML_INT_private_VERIFY(KWIML_INT_detail_VERIFY_##t, s, sizeof(t))
-#define KWIML_INT_private_VERIFY_SIGN(t, u, o)
KWIML_INT_private_VERIFY_BOOL(SIGN_##t, (t)((u)1 << ((sizeof(t)<<3)-1)) o 0)
+#define KWIML_INT_private_VERIFY_SIGN(t, u, o) \
+ KWIML_INT_private_VERIFY_BOOL(SIGN_##t, KWIML_INT_private_STATIC_CAST( \
+ t, KWIML_INT_private_STATIC_CAST(u, 1) << ((sizeof(t)<<3)-1)) o 0)
KWIML_INT_private_VERIFY_TYPE(KWIML_INT_int8_t, 1);
KWIML_INT_private_VERIFY_TYPE(KWIML_INT_uint8_t, 1);
@@ -1060,6 +1069,8 @@ KWIML_INT_private_VERIFY_SIGN(KWIML_INT_uintptr_t,
KWIML_INT_uintptr_t, >);
#undef KWIML_INT_private_VERIFY_0
#undef KWIML_INT_private_VERIFY
+#undef KWIML_INT_private_STATIC_CAST
+
#if defined(_MSC_VER)
# pragma warning (pop)
#endif
diff --git a/src/version.h.in b/src/version.h.in
index 0ac8854..5c566bb 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -1,6 +1,6 @@
/*============================================================================
Kitware Information Macro Library
- Copyright 2010-2016 Kitware, Inc.
+ Copyright 2010-2018 Kitware, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/test/test_int_format.h b/test/test_int_format.h
index 24dcdfb..2e0310c 100644
--- a/test/test_int_format.h
+++ b/test/test_int_format.h
@@ -8,6 +8,7 @@
#if defined(_MSC_VER)
# pragma warning (push)
+# pragma warning (disable:4309) /* static_cast trunction of constant value */
# pragma warning (disable:4310) /* cast truncates constant value */
#endif
@@ -17,7 +18,13 @@
# define LANG "C "
#endif
-#define VALUE(T, U) (T)((U)0xab << ((sizeof(T)-1)<<3))
+#if defined(__cplusplus) && !defined(__BORLANDC__)
+# define STATIC_CAST(t,v) static_cast<t>(v)
+#else
+# define STATIC_CAST(t,v) (t)(v)
+#endif
+
+#define VALUE(T, U) STATIC_CAST(T, STATIC_CAST(U, 0xab) << ((sizeof(T)-1)<<3))
#define TEST_C_(C, V, PRI, T, U) \
{ \
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c1ecab64da6a8c7738770316ddf8a72bbf8eb1f
commit 2c1ecab64da6a8c7738770316ddf8a72bbf8eb1f
Author: Justin Goshi <jgo...@microsoft.com>
AuthorDate: Wed Jan 3 16:49:00 2018 -0800
Commit: Justin Goshi <jgo...@microsoft.com>
CommitDate: Wed Jan 3 16:49:00 2018 -0800
server: Expand generator expressions for test info
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index d745c49..6b7143b 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -748,7 +748,8 @@ static Json::Value DumpSourceFilesList(
return result;
}
-static Json::Value DumpCTestInfo(cmTest* testInfo)
+static Json::Value DumpCTestInfo(cmLocalGenerator* lg, cmTest* testInfo,
+ const std::string& config)
{
Json::Value result = Json::objectValue;
result[kCTEST_NAME] = testInfo->GetName();
@@ -760,14 +761,24 @@ static Json::Value DumpCTestInfo(cmTest* testInfo)
command.append(cmd);
command.append(" ");
}
- result[kCTEST_COMMAND] = command;
+
+ // Remove any config specific variables from the output.
+ cmGeneratorExpression ge;
+ auto cge = ge.Parse(command.c_str());
+ const char* processed = cge->Evaluate(lg, config);
+
+ result[kCTEST_COMMAND] = processed;
// Build up the list of properties that may have been specified
Json::Value properties = Json::arrayValue;
for (auto& prop : testInfo->GetProperties()) {
Json::Value entry = Json::objectValue;
entry[kKEY_KEY] = prop.first;
- entry[kVALUE_KEY] = prop.second.GetValue();
+
+ // Remove config variables from the value too.
+ auto cge_value = ge.Parse(prop.second.GetValue());
+ const char* processed_value = cge_value->Evaluate(lg, config);
+ entry[kVALUE_KEY] = processed_value;
properties.append(entry);
}
result[kPROPERTIES_KEY] = properties;
@@ -775,13 +786,14 @@ static Json::Value DumpCTestInfo(cmTest* testInfo)
return result;
}
-static void DumpMakefileTests(cmMakefile* mf, const std::string& config,
+static void DumpMakefileTests(cmLocalGenerator* lg, const std::string& config,
Json::Value* result)
{
+ auto mf = lg->GetMakefile();
std::vector<cmTest*> tests;
mf->GetTests(config, tests);
for (auto test : tests) {
- Json::Value tmp = DumpCTestInfo(test);
+ Json::Value tmp = DumpCTestInfo(lg, test, config);
if (!tmp.isNull()) {
result->append(tmp);
}
@@ -805,8 +817,7 @@ static Json::Value DumpCTestProjectList(const cmake* cm,
for (const auto& lg : projectIt.second) {
// Make sure they're generated.
lg->GenerateTestFiles();
- cmMakefile* mf = lg->GetMakefile();
- DumpMakefileTests(mf, config, &tests);
+ DumpMakefileTests(lg, config, &tests);
}
pObj[kCTEST_INFO] = tests;
-----------------------------------------------------------------------
Summary of changes:
Source/cmServerProtocol.cxx | 25 ++++++++++++++++++-------
Utilities/KWIML/Copyright.txt | 2 +-
Utilities/KWIML/include/kwiml/abi.h | 19 +++++++++++++++----
Utilities/KWIML/include/kwiml/int.h | 15 +++++++++++++--
Utilities/KWIML/src/version.h.in | 2 +-
Utilities/KWIML/test/test_int_format.h | 9 ++++++++-
6 files changed, 56 insertions(+), 16 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
