[Cmake-commits] CMake branch, next, updated. v2.8.2-973-g4a29eb6

[Ben Boeckel]

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  4a29eb664d7322615d031e1b38e851dad9255d91 (commit)
       via  220c5dc45a61b37603e17c09d3ed9e030df55196 (commit)
      from  7a195027b9ea40fef243a2b324a8258c2e62ef8d (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=4a29eb664d7322615d031e1b38e851dad9255d91
commit 4a29eb664d7322615d031e1b38e851dad9255d91
Merge: 7a19502 220c5dc
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 30 11:03:28 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 30 11:03:28 2010 -0400

    Merge topic 'dev/test-for-bug-11230' into next
    
    220c5dc Add test that CMake errors with empty libs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=220c5dc45a61b37603e17c09d3ed9e030df55196
commit 220c5dc45a61b37603e17c09d3ed9e030df55196
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 30 11:01:35 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Sep 30 11:01:35 2010 -0400

    Add test that CMake errors with empty libs
    
    When the library language cannot be determined, make sure CMake errors,
    not segfaults (bug #11230)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5e88b5c..4de9ac3 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -153,6 +153,9 @@ IF(BUILD_TESTING)
   ADD_TEST_MACRO(ExportImport ExportImport)
   ADD_TEST_MACRO(Unset Unset)
   ADD_TEST_MACRO(PolicyScope PolicyScope)
+  ADD_TEST_MACRO(EmptyLibrary EmptyLibrary)
+  SET_TESTS_PROPERTIES(EmptyLibrary PROPERTIES
+    PASS_REGULAR_EXPRESSION "CMake Error: Cannot determine link language for target \"test\"")
   ADD_TEST_MACRO(CrossCompile CrossCompile)
   SET_TESTS_PROPERTIES(CrossCompile PROPERTIES
     PASS_REGULAR_EXPRESSION "TRY_RUN.. invoked in cross-compiling mode")
diff --git a/Tests/EmptyLibrary/CMakeLists.txt b/Tests/EmptyLibrary/CMakeLists.txt
new file mode 100644
index 0000000..baddbbf
--- /dev/null
+++ b/Tests/EmptyLibrary/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 2.6)
+project(TestEmptyLibrary)
+
+add_subdirectory(subdir)
diff --git a/Tests/EmptyLibrary/subdir/CMakeLists.txt b/Tests/EmptyLibrary/subdir/CMakeLists.txt
new file mode 100644
index 0000000..e273f8d
--- /dev/null
+++ b/Tests/EmptyLibrary/subdir/CMakeLists.txt
@@ -0,0 +1 @@
+add_library(test test.h)
diff --git a/Tests/EmptyLibrary/subdir/test.h b/Tests/EmptyLibrary/subdir/test.h
new file mode 100644
index 0000000..8511f53
--- /dev/null
+++ b/Tests/EmptyLibrary/subdir/test.h
@@ -0,0 +1 @@
+extern int dummy;

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt                     |    3 +++
 Tests/EmptyLibrary/CMakeLists.txt        |    4 ++++
 Tests/EmptyLibrary/subdir/CMakeLists.txt |    1 +
 Tests/EmptyLibrary/subdir/test.h         |    1 +
 4 files changed, 9 insertions(+), 0 deletions(-)
 create mode 100644 Tests/EmptyLibrary/CMakeLists.txt
 create mode 100644 Tests/EmptyLibrary/subdir/CMakeLists.txt
 create mode 100644 Tests/EmptyLibrary/subdir/test.h


hooks/post-receive
-- 
CMake