kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: remove duplicate file name test because it fails on xcode

This commit is contained in:
Bill Hoffman 2006-04-17 18:10:16 -04:00
parent 71b370c79c
commit 1c44342cff
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/Complex/Executable/CMakeLists.txt
View File

@ -20,8 +20,8 @@ SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared
LINK_LIBRARIES(${COMPLEX_LIBS}) LINK_LIBRARIES(${COMPLEX_LIBS})
ADD_EXECUTABLE(A A.cxx) ADD_EXECUTABLE(A A.cxx)
ADD_EXECUTABLE(complex complex testcflags.c ADD_EXECUTABLE(complex complex testcflags.c )
Sub1/NameConflictTest.c Sub2/NameConflictTest.c) # Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
ADD_EXECUTABLE(complex.file complex.file.cxx) ADD_EXECUTABLE(complex.file complex.file.cxx)
IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar)

4
Tests/Complex/Executable/complex.cxx
View File

@ -290,10 +290,12 @@ void ForceStringUse()
extern "C" int TestCFlags(char* m); extern "C" int TestCFlags(char* m);
extern "C" int TestTargetCompileFlags(char* m); extern "C" int TestTargetCompileFlags(char* m);
#if 0
// defined in Sub1/NameConflictTest.c // defined in Sub1/NameConflictTest.c
extern "C" int NameConflictTest1(); extern "C" int NameConflictTest1();
// defined in Sub2/NameConflictTest.c // defined in Sub2/NameConflictTest.c
extern "C" int NameConflictTest2(); extern "C" int NameConflictTest2();
#endif
// ====================================================================== // ======================================================================
@ -400,6 +402,7 @@ int main()
cmFailed("cmSystemTools::UpperCase is working"); cmFailed("cmSystemTools::UpperCase is working");
} }
#endif #endif
#if 0
if(NameConflictTest1() == 0 && NameConflictTest2() == 0) if(NameConflictTest1() == 0 && NameConflictTest2() == 0)
{ {
cmPassed("Sub dir with same named source works"); cmPassed("Sub dir with same named source works");
@ -408,6 +411,7 @@ int main()
{ {
cmFailed("Sub dir with same named source fails"); cmFailed("Sub dir with same named source fails");
} }
#endif
if(file1() != 1) if(file1() != 1)
{ {
cmFailed("Call to file1 function from library failed."); cmFailed("Call to file1 function from library failed.");

4
Tests/ComplexOneConfig/Executable/CMakeLists.txt
View File

@ -20,8 +20,8 @@ SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared
LINK_LIBRARIES(${COMPLEX_LIBS}) LINK_LIBRARIES(${COMPLEX_LIBS})
ADD_EXECUTABLE(A A.cxx) ADD_EXECUTABLE(A A.cxx)
ADD_EXECUTABLE(complex complex testcflags.c ADD_EXECUTABLE(complex complex testcflags.c )
Sub1/NameConflictTest.c Sub2/NameConflictTest.c) # Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
ADD_EXECUTABLE(complex.file complex.file.cxx) ADD_EXECUTABLE(complex.file complex.file.cxx)
IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar)

4
Tests/ComplexOneConfig/Executable/complex.cxx
View File

@ -290,10 +290,12 @@ void ForceStringUse()
extern "C" int TestCFlags(char* m); extern "C" int TestCFlags(char* m);
extern "C" int TestTargetCompileFlags(char* m); extern "C" int TestTargetCompileFlags(char* m);
#if 0
// defined in Sub1/NameConflictTest.c // defined in Sub1/NameConflictTest.c
extern "C" int NameConflictTest1(); extern "C" int NameConflictTest1();
// defined in Sub2/NameConflictTest.c // defined in Sub2/NameConflictTest.c
extern "C" int NameConflictTest2(); extern "C" int NameConflictTest2();
#endif
// ====================================================================== // ======================================================================
@ -400,6 +402,7 @@ int main()
cmFailed("cmSystemTools::UpperCase is working"); cmFailed("cmSystemTools::UpperCase is working");
} }
#endif #endif
#if 0
if(NameConflictTest1() == 0 && NameConflictTest2() == 0) if(NameConflictTest1() == 0 && NameConflictTest2() == 0)
{ {
cmPassed("Sub dir with same named source works"); cmPassed("Sub dir with same named source works");
@ -408,6 +411,7 @@ int main()
{ {
cmFailed("Sub dir with same named source fails"); cmFailed("Sub dir with same named source fails");
} }
#endif
if(file1() != 1) if(file1() != 1)
{ {
cmFailed("Call to file1 function from library failed."); cmFailed("Call to file1 function from library failed.");

4
Tests/ComplexRelativePaths/Executable/CMakeLists.txt
View File

@ -20,8 +20,8 @@ SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared
LINK_LIBRARIES(${COMPLEX_LIBS}) LINK_LIBRARIES(${COMPLEX_LIBS})
ADD_EXECUTABLE(A A.cxx) ADD_EXECUTABLE(A A.cxx)
ADD_EXECUTABLE(complex complex testcflags.c ADD_EXECUTABLE(complex complex testcflags.c )
Sub1/NameConflictTest.c Sub2/NameConflictTest.c) # Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
ADD_EXECUTABLE(complex.file complex.file.cxx) ADD_EXECUTABLE(complex.file complex.file.cxx)
IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar)

4
Tests/ComplexRelativePaths/Executable/complex.cxx
View File

@ -290,10 +290,12 @@ void ForceStringUse()
extern "C" int TestCFlags(char* m); extern "C" int TestCFlags(char* m);
extern "C" int TestTargetCompileFlags(char* m); extern "C" int TestTargetCompileFlags(char* m);
#if 0
// defined in Sub1/NameConflictTest.c // defined in Sub1/NameConflictTest.c
extern "C" int NameConflictTest1(); extern "C" int NameConflictTest1();
// defined in Sub2/NameConflictTest.c // defined in Sub2/NameConflictTest.c
extern "C" int NameConflictTest2(); extern "C" int NameConflictTest2();
#endif
// ====================================================================== // ======================================================================
@ -400,6 +402,7 @@ int main()
cmFailed("cmSystemTools::UpperCase is working"); cmFailed("cmSystemTools::UpperCase is working");
} }
#endif #endif
#if 0
if(NameConflictTest1() == 0 && NameConflictTest2() == 0) if(NameConflictTest1() == 0 && NameConflictTest2() == 0)
{ {
cmPassed("Sub dir with same named source works"); cmPassed("Sub dir with same named source works");
@ -408,6 +411,7 @@ int main()
{ {
cmFailed("Sub dir with same named source fails"); cmFailed("Sub dir with same named source fails");
} }
#endif
if(file1() != 1) if(file1() != 1)
{ {
cmFailed("Call to file1 function from library failed."); cmFailed("Call to file1 function from library failed.");