diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2010-09-02 22:02:57 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2010-09-02 22:02:57 (GMT) |
| commit | d26cd46989b4e1170cbebc97ae3b6b30395158db (patch) | |
| tree | a10cf2510b18cb3344964a97baa2020305ca747c | |
| parent | ced61f5722d65525fd4b8dbf96d5ea8f254099c2 (diff) | |
| download | CMake-d26cd46989b4e1170cbebc97ae3b6b30395158db.zip CMake-d26cd46989b4e1170cbebc97ae3b6b30395158db.tar.gz CMake-d26cd46989b4e1170cbebc97ae3b6b30395158db.tar.bz2 | |
Only use .CPP .CXX and .C++ do not work by default with g+++.
| -rw-r--r-- | Modules/CMakeCXXCompiler.cmake.in | 2 | ||||
| -rw-r--r-- | Tests/CxxOnly/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CxxOnly/cxxonly.cxx | 4 | ||||
| -rw-r--r-- | Tests/CxxOnly/test.C++ | 1 | ||||
| -rw-r--r-- | Tests/CxxOnly/test.CXX | 1 |
5 files changed, 3 insertions, 7 deletions
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; |