[Cmake-commits] CMake branch, next, updated. v2.8.9-191-g6f4627f

[Brad King]

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  6f4627f9568da9cfa0f3faee7329b1f91d7342a0 (commit)
       via  94c08b368c40da4f39a506440d0c5cf3c4c23c48 (commit)
      from  86e9e24d7d5bffbbfc3f219aeaa0c1669b82c6d8 (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=6f4627f9568da9cfa0f3faee7329b1f91d7342a0
commit 6f4627f9568da9cfa0f3faee7329b1f91d7342a0
Merge: 86e9e24 94c08b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 20 15:44:48 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 20 15:44:48 2012 -0400

    Merge topic 'test-ObjectLibrary-lang' into next
    
    94c08b3 Tests/ObjectLibrary: Do not enable CXX in subdirectories


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94c08b368c40da4f39a506440d0c5cf3c4c23c48
commit 94c08b368c40da4f39a506440d0c5cf3c4c23c48
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 20 14:45:48 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 20 14:47:33 2012 -0400

    Tests/ObjectLibrary: Do not enable CXX in subdirectories
    
    In commit b237dbd8 (Xcode: Fix object library references in
    multi-project trees, 2012-08-03) we accidentally enabled CXX in the
    subdiretories of this test by invoking project() with only one argument.
    The top-level directory of the test enables only C, so do this in the
    subdirectories too.

diff --git a/Tests/ObjectLibrary/A/CMakeLists.txt b/Tests/ObjectLibrary/A/CMakeLists.txt
index 04ab02f..36c86e7 100644
--- a/Tests/ObjectLibrary/A/CMakeLists.txt
+++ b/Tests/ObjectLibrary/A/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(ObjectLibraryA)
+project(ObjectLibraryA C)
 # Add -fPIC so objects can be used in shared libraries.
 # TODO: Need property for this.
 if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM)
diff --git a/Tests/ObjectLibrary/B/CMakeLists.txt b/Tests/ObjectLibrary/B/CMakeLists.txt
index 4b0b07d..32d8ceb 100644
--- a/Tests/ObjectLibrary/B/CMakeLists.txt
+++ b/Tests/ObjectLibrary/B/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(ObjectLibraryB)
+project(ObjectLibraryB C)
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6")
   # VS 6 generator does not use per-target object locations.
   set(vs6 _vs6)

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

Summary of changes:
 Tests/ObjectLibrary/A/CMakeLists.txt |    2 +-
 Tests/ObjectLibrary/B/CMakeLists.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake