[Cmake-commits] CMake branch, next, updated. v2.8.2-664-g91309fc

[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  91309fcaee1e481732f2ba216d371a70b8e27afc (commit)
       via  d26cd46989b4e1170cbebc97ae3b6b30395158db (commit)
      from  1e822b994fb64540bcb5bcc0dd3429d404ba9307 (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=91309fcaee1e481732f2ba216d371a70b8e27afc
commit 91309fcaee1e481732f2ba216d371a70b8e27afc
Merge: 1e822b9 d26cd46
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Sep 2 18:07:42 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 2 18:07:42 2010 -0400

    Merge topic 'allow_upper_case_cpp_and_others' into next
    
    d26cd46 Only use .CPP .CXX and .C++ do not work by default with g+++.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d26cd46989b4e1170cbebc97ae3b6b30395158db
commit d26cd46989b4e1170cbebc97ae3b6b30395158db
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Sep 2 18:02:57 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Sep 2 18:02:57 2010 -0400

    Only use .CPP .CXX and .C++ do not work by default with g+++.

diff --git a/Modules/CMakeCXXCompiler.cmake.in b/Modules/CMakeCXXCompiler.cmake.in
index e1b25d2..d7ae8d9 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -22,7 +22,7 @@ IF(CMAKE_COMPILER_IS_MINGW)
 ENDIF(CMAKE_COMPILER_IS_MINGW)
 SET(CMAKE_CXX_COMPILER_ID_RUN 1)
 SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC)
-SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;C++;CC;CPP;CXX)
+SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;CPP)
 SET(CMAKE_CXX_LINKER_PREFERENCE 30)
 SET(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
 
diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt
index 8418ad9..8258eb4 100644
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@ -2,7 +2,7 @@
 project (CxxOnly CXX)
 
 set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-add_library(testcxx1 STATIC libcxx1.cxx test.CPP test.CXX test.C++)
+add_library(testcxx1 STATIC libcxx1.cxx test.CPP)
 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 2996e65..bd4fd59 100644
--- a/Tests/CxxOnly/cxxonly.cxx
+++ b/Tests/CxxOnly/cxxonly.cxx
@@ -1,14 +1,12 @@
 #include "libcxx1.h"
 #include "libcxx2.h"
 extern int testCPP;
-extern int testCXX;
-extern int testCplusplus;
 
 #include <stdio.h>
 
 int main ()
 {
-  testCPP = testCXX= testCplusplus = 1;
+  testCPP = 1;
   if ( LibCxx1Class::Method() != 2.0 )
     {
     printf("Problem with libcxx1\n");
diff --git a/Tests/CxxOnly/test.C++ b/Tests/CxxOnly/test.C++
deleted file mode 100644
index 6049ef1..0000000
--- a/Tests/CxxOnly/test.C++
+++ /dev/null
@@ -1 +0,0 @@
-int testCplusplus;
diff --git a/Tests/CxxOnly/test.CXX b/Tests/CxxOnly/test.CXX
deleted file mode 100644
index c05f788..0000000
--- a/Tests/CxxOnly/test.CXX
+++ /dev/null
@@ -1 +0,0 @@
-int testCXX;

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

Summary of changes:
 Modules/CMakeCXXCompiler.cmake.in |    2 +-
 Tests/CxxOnly/CMakeLists.txt      |    2 +-
 Tests/CxxOnly/cxxonly.cxx         |    4 +---
 Tests/CxxOnly/test.C++            |    1 -
 Tests/CxxOnly/test.CXX            |    1 -
 5 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 Tests/CxxOnly/test.C++
 delete mode 100644 Tests/CxxOnly/test.CXX


hooks/post-receive
-- 
CMake