diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-14 19:05:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-09-14 19:05:09 (GMT) |
| commit | eccc7d5d267d7dc4eab027fab54ef4e7a63c8d4f (patch) | |
| tree | b0ab46080ec15fc066b57f0606d70fb9fc9756b4 | |
| parent | ed37fc3ea398b03bbba175ae337f14b6af58daee (diff) | |
| parent | 7944e4e0ac37cb1423da2de7a203557b77372aac (diff) | |
| download | CMake-eccc7d5d267d7dc4eab027fab54ef4e7a63c8d4f.zip CMake-eccc7d5d267d7dc4eab027fab54ef4e7a63c8d4f.tar.gz CMake-eccc7d5d267d7dc4eab027fab54ef4e7a63c8d4f.tar.bz2 | |
Merge branch 'allow_upper_case_cpp_and_others' into resolve/fix_target_name_with_dot_vs10/allow_upper_case_cpp_and_others
Conflicts:
Tests/CxxOnly/CMakeLists.txt
| -rw-r--r-- | Tests/CxxOnly/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/CxxOnly/cxxonly.cxx | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt index 0b2c1c5..5d27890 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.my STATIC libcxx1.cxx test.CPP) +if(WIN32) + set(EXTRA_SRCS test.CPP) +endif() +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.my 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"); |