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
This commit is contained in:
Brad King 2010-09-14 15:05:09 -04:00
commit eccc7d5d26
2 changed files with 8 additions and 1 deletions

View File

@ -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)

View File

@ -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");