summaryrefslogtreecommitdiff
path: root/Tests
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2010-09-02 18:02:57 -0400
committerBill Hoffman <bill.hoffman@kitware.com>2010-09-02 18:02:57 -0400
commitd26cd46989b4e1170cbebc97ae3b6b30395158db (patch)
treea10cf2510b18cb3344964a97baa2020305ca747c /Tests
parentced61f5722d65525fd4b8dbf96d5ea8f254099c2 (diff)
downloadcmake-d26cd46989b4e1170cbebc97ae3b6b30395158db.tar.gz
Only use .CPP .CXX and .C++ do not work by default with g+++.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CxxOnly/CMakeLists.txt2
-rw-r--r--Tests/CxxOnly/cxxonly.cxx4
-rw-r--r--Tests/CxxOnly/test.C++1
-rw-r--r--Tests/CxxOnly/test.CXX1
4 files changed, 2 insertions, 6 deletions
diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt
index 8418ad9946..8258eb427f 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 2996e65c82..bd4fd59149 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 6049ef12dc..0000000000
--- 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 c05f7881ac..0000000000
--- a/Tests/CxxOnly/test.CXX
+++ /dev/null
@@ -1 +0,0 @@
-int testCXX;