[Cmake-commits] CMake branch, next, updated. v2.8.9-3045-g0c3cbc5
Stephen Kelly
steveire at gmail.com
Fri Aug 10 10:49:20 EDT 2012
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 0c3cbc5715348833b46ed40bbad6c880811ed764 (commit)
via 5d44e7b15ab40ba4568ce7c584df587c03caed40 (commit)
from eb0df2af00914a20e29eb57e4c0348902edbeacb (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=0c3cbc5715348833b46ed40bbad6c880811ed764
commit 0c3cbc5715348833b46ed40bbad6c880811ed764
Merge: eb0df2a 5d44e7b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 10 10:49:16 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 10 10:49:16 2012 -0400
Merge topic 'generate_export_header-fixes' into next
5d44e7b Exclude Borland from running this test in C mode.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d44e7b15ab40ba4568ce7c584df587c03caed40
commit 5d44e7b15ab40ba4568ce7c584df587c03caed40
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 10 16:48:00 2012 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 10 16:48:00 2012 +0200
Exclude Borland from running this test in C mode.
It fails for a reason I do not understand.
diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
index 20e8225..d4db011 100644
--- a/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
@@ -38,5 +38,7 @@ endmacro()
run_tests("")
run_tests("CXX")
-run_tests("C")
+if (NOT ${CMAKE_C_COMPILER_ID} MATCHES "Borland")
+ run_tests("C")
+endif()
run_tests("C CXX")
diff --git a/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
index 158a423..8df1bf3 100644
--- a/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
@@ -52,5 +52,7 @@ endmacro()
run_tests("")
run_tests("CXX")
-run_tests("C")
+if (NOT ${CMAKE_C_COMPILER_ID} MATCHES "Borland")
+ run_tests("C")
+endif()
run_tests("C CXX")
-----------------------------------------------------------------------
Summary of changes:
.../lib_shared_and_statictest/CMakeLists.txt | 4 +++-
.../libsharedtest/CMakeLists.txt | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list