[Cmake-commits] CMake branch, next, updated. v2.8.6-1930-gd9b7892
Brad King
brad.king at kitware.com
Thu Nov 17 10:21:36 EST 2011
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 d9b78923e37166af378de4a9cb371c3410e82758 (commit)
via aaf376594cf4ae1d541189a2789382db47aa5d7b (commit)
via 9ccd639ad70c65b844f6610c5ae08a63e25f6806 (commit)
via 8be93fc487064c5b417ab9b0ebd4e027a5e6b9ea (commit)
from 5999dd07a879f73a1e5e233a4a4ea88d3bc6afce (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=d9b78923e37166af378de4a9cb371c3410e82758
commit d9b78923e37166af378de4a9cb371c3410e82758
Merge: 5999dd0 aaf3765
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 17 10:21:30 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 17 10:21:30 2011 -0500
Merge topic 'update-KWIML' into next
aaf3765 Merge branch 'upstream-kwiml' into update-KWIML
9ccd639 KWIML: Ignore _LONGLONG on MS compiler
8be93fc KWIML: Test header inclusion after system headers
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaf376594cf4ae1d541189a2789382db47aa5d7b
commit aaf376594cf4ae1d541189a2789382db47aa5d7b
Merge: 21469b6 9ccd639
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 17 10:16:57 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 17 10:16:57 2011 -0500
Merge branch 'upstream-kwiml' into update-KWIML
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ccd639ad70c65b844f6610c5ae08a63e25f6806
commit 9ccd639ad70c65b844f6610c5ae08a63e25f6806
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 17 10:15:02 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 17 10:15:02 2011 -0500
KWIML: Ignore _LONGLONG on MS compiler
The VS 7.0 header <yvals.h> included by most C++ system headers defines
the macro _LONGLONG as __int64. Teach ABI.h to ignore the definition in
this case because "long long" does not exist.
diff --git a/ABI.h.in b/ABI.h.in
index c4121ff..0ec6d0e 100644
--- a/ABI.h.in
+++ b/ABI.h.in
@@ -216,7 +216,8 @@ suppression macro @KWIML at _ABI_NO_VERIFY was defined.
# endif
#endif
#if !defined(@KWIML at _ABI_SIZEOF_LONG_LONG)
-# if defined(_LONGLONG) /* SGI, some GNU, perhaps others. */
+# if defined(_LONGLONG) /* SGI, some GNU, perhaps others. */ \
+ && !defined(_MSC_VER)
# define @KWIML at _ABI_SIZEOF_LONG_LONG 8
# elif defined(_LONG_LONG) /* IBM XL, perhaps others. */
# define @KWIML at _ABI_SIZEOF_LONG_LONG 8
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8be93fc487064c5b417ab9b0ebd4e027a5e6b9ea
commit 8be93fc487064c5b417ab9b0ebd4e027a5e6b9ea
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 17 08:54:46 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 17 08:57:26 2011 -0500
KWIML: Test header inclusion after system headers
Some system headers may define macros that interfere with preprocessor
tests in KWIML headers. Test this case to be sure that the verification
checks at the bottom of the headers do not fail.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index febc994..a2359cc 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -35,6 +35,7 @@ if(KWIML_LANGUAGE_C)
list(APPEND test_srcs
test_ABI_C.c
test_INT_C.c
+ test_include_C.c
)
endif()
if(KWIML_LANGUAGE_CXX)
@@ -42,6 +43,7 @@ if(KWIML_LANGUAGE_CXX)
list(APPEND test_srcs
test_ABI_CXX.cxx
test_INT_CXX.cxx
+ test_include_CXX.cxx
)
endif()
diff --git a/test/test.c b/test/test.c
index d71a284..131c81f 100644
--- a/test/test.c
+++ b/test/test.c
@@ -16,6 +16,8 @@ extern int test_ABI_C(void);
extern int test_INT_C(void);
extern int test_ABI_CXX(void);
extern int test_INT_CXX(void);
+extern int test_include_C(void);
+extern int test_include_CXX(void);
#ifdef __cplusplus
} // extern "C"
#endif
@@ -26,10 +28,12 @@ int main(void)
#ifdef KWIML_LANGUAGE_C
result = test_ABI_C() && result;
result = test_INT_C() && result;
+ result = test_include_C() && result;
#endif
#ifdef KWIML_LANGUAGE_CXX
result = test_ABI_CXX() && result;
result = test_INT_CXX() && result;
+ result = test_include_CXX() && result;
#endif
return result? 0 : 1;
}
diff --git a/test/test.c b/test/test_include_C.c
similarity index 53%
copy from test/test.c
copy to test/test_include_C.c
index d71a284..fb3e4cf 100644
--- a/test/test.c
+++ b/test/test_include_C.c
@@ -9,27 +9,14 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern int test_ABI_C(void);
-extern int test_INT_C(void);
-extern int test_ABI_CXX(void);
-extern int test_INT_CXX(void);
-#ifdef __cplusplus
-} // extern "C"
-#endif
+#include <stdio.h>
-int main(void)
+/* Test KWIML header inclusion after above system headers. */
+#include "test.h"
+#include KWIML_HEADER(ABI.h)
+#include KWIML_HEADER(INT.h)
+
+int test_include_C(void)
{
- int result = 1;
-#ifdef KWIML_LANGUAGE_C
- result = test_ABI_C() && result;
- result = test_INT_C() && result;
-#endif
-#ifdef KWIML_LANGUAGE_CXX
- result = test_ABI_CXX() && result;
- result = test_INT_CXX() && result;
-#endif
- return result? 0 : 1;
+ return 1;
}
diff --git a/test/test.c b/test/test_include_CXX.cxx
similarity index 53%
copy from test/test.c
copy to test/test_include_CXX.cxx
index d71a284..057b7c2 100644
--- a/test/test.c
+++ b/test/test_include_CXX.cxx
@@ -9,27 +9,14 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern int test_ABI_C(void);
-extern int test_INT_C(void);
-extern int test_ABI_CXX(void);
-extern int test_INT_CXX(void);
-#ifdef __cplusplus
-} // extern "C"
-#endif
+#include <string>
-int main(void)
+/* Test KWIML header inclusion after above system headers. */
+#include "test.h"
+#include KWIML_HEADER(ABI.h)
+#include KWIML_HEADER(INT.h)
+
+extern "C" int test_include_CXX(void)
{
- int result = 1;
-#ifdef KWIML_LANGUAGE_C
- result = test_ABI_C() && result;
- result = test_INT_C() && result;
-#endif
-#ifdef KWIML_LANGUAGE_CXX
- result = test_ABI_CXX() && result;
- result = test_INT_CXX() && result;
-#endif
- return result? 0 : 1;
+ return 1;
}
-----------------------------------------------------------------------
Summary of changes:
Utilities/KWIML/ABI.h.in | 3 ++-
Utilities/KWIML/test/CMakeLists.txt | 2 ++
Utilities/KWIML/test/test.c | 4 ++++
.../KWIML/test/{test_INT_C.c => test_include_C.c} | 12 ++++++------
.../{test_INT_CXX.cxx => test_include_CXX.cxx} | 12 ++++++------
5 files changed, 20 insertions(+), 13 deletions(-)
copy Utilities/KWIML/test/{test_INT_C.c => test_include_C.c} (81%)
copy Utilities/KWIML/test/{test_INT_CXX.cxx => test_include_CXX.cxx} (79%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list