[Cmake-commits] CMake branch, next, updated. v2.8.2-679-g1979573

[Bill Hoffman]

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  1979573855f2b562f8645439cd4a52b4e7ba34c6 (commit)
       via  ba0a8905395ec7e616bbedee33a83fcf15a86910 (commit)
      from  ae9934e178647216050a770efef9e81814f8ef0b (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=1979573855f2b562f8645439cd4a52b4e7ba34c6
commit 1979573855f2b562f8645439cd4a52b4e7ba34c6
Merge: ae9934e ba0a890
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Mon Sep 6 12:57:12 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Mon Sep 6 12:57:12 2010 -0400

    Merge branch 'allow_upper_case_cpp_and_others' into next
    
    Conflicts:
    	Tests/CxxOnly/CMakeLists.txt

diff --cc Tests/CxxOnly/CMakeLists.txt
index 0b2c1c5,4654f44..ad3315c
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@@ -2,7 -2,10 +2,10 @@@
  project (CxxOnly CXX)
  
  set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
- add_library(testcxx1.my STATIC libcxx1.cxx test.CPP)
+ if(MSVC)
+   set(EXTRA_SRCS test.CPP)
+ endif()
 -add_library(testcxx1 STATIC libcxx1.cxx ${EXTRA_SRCS})
++add_library(testcxx1.my STATIC libcxx1.cxx ${EXTRA_SRCS})
  add_library(testcxx2 SHARED libcxx2.cxx)
  add_executable (CxxOnly cxxonly.cxx)
 -target_link_libraries(CxxOnly testcxx1 testcxx2)
 +target_link_libraries(CxxOnly testcxx1.my testcxx2)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba0a8905395ec7e616bbedee33a83fcf15a86910
commit ba0a8905395ec7e616bbedee33a83fcf15a86910
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Mon Sep 6 12:43:57 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Mon Sep 6 12:43:57 2010 -0400

    Only test for .CPP on Microsoft compilers which will handle .CPP as c++.

diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt
index 8258eb4..4654f44 100644
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@ -2,7 +2,10 @@
 project (CxxOnly CXX)
 
 set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-add_library(testcxx1 STATIC libcxx1.cxx test.CPP)
+if(MSVC)
+  set(EXTRA_SRCS test.CPP)
+endif()
+add_library(testcxx1 STATIC libcxx1.cxx ${EXTRA_SRCS})
 add_library(testcxx2 SHARED libcxx2.cxx)
 add_executable (CxxOnly cxxonly.cxx)
 target_link_libraries(CxxOnly testcxx1 testcxx2)
diff --git a/Tests/CxxOnly/cxxonly.cxx b/Tests/CxxOnly/cxxonly.cxx
index bd4fd59..9cf6f2d 100644
--- a/Tests/CxxOnly/cxxonly.cxx
+++ b/Tests/CxxOnly/cxxonly.cxx
@@ -1,12 +1,16 @@
 #include "libcxx1.h"
 #include "libcxx2.h"
+#ifdef _MSC_VER
 extern int testCPP;
+#endif
 
 #include <stdio.h>
 
 int main ()
 {
+#ifdef _MSC_VER
   testCPP = 1;
+#endif
   if ( LibCxx1Class::Method() != 2.0 )
     {
     printf("Problem with libcxx1\n");

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

Summary of changes:
 Tests/CxxOnly/CMakeLists.txt |    5 ++++-
 Tests/CxxOnly/cxxonly.cxx    |    4 ++++
 2 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake