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

BUG: Disable deep-source test on Watcom until it can be fixed. This is a new feature for other generators anyway.

This commit is contained in:
Brad King 2007-03-21 07:16:32 -04:00
parent cb83efbe90
commit 0cb45081d9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tests/OutOfSource/OutOfSourceSubdir/CMakeLists.txt
View File

@ -21,13 +21,6 @@ IF ("${PROJECT_SOURCE_DIR}" STREQUAL "${ANOTHER_PROJ_SOURCE_DIR}")
MATH(EXPR MAXPATH "${MAXPATH} - 46") MATH(EXPR MAXPATH "${MAXPATH} - 46")
ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio 8") ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio 8")
# Watcom WMake seems to have problems with long command lines. This
# limit should still be big enough to require special object file name
# conversion.
IF(${CMAKE_GENERATOR} MATCHES "Watcom WMake")
SET(MAXPATH 180)
ENDIF(${CMAKE_GENERATOR} MATCHES "Watcom WMake")
# MAXPATH less 25 for last /and/deeper/simple.cxx part and small safety # MAXPATH less 25 for last /and/deeper/simple.cxx part and small safety
MATH(EXPR MAXPATH "${MAXPATH} - 25") MATH(EXPR MAXPATH "${MAXPATH} - 25")
STRING(LENGTH "${DEEPDIR}" DEEPDIR_LEN) STRING(LENGTH "${DEEPDIR}" DEEPDIR_LEN)
@ -39,6 +32,13 @@ IF ("${PROJECT_SOURCE_DIR}" STREQUAL "${ANOTHER_PROJ_SOURCE_DIR}")
STRING(LENGTH "${DEEPSRC}" DEEPSRC_LEN) STRING(LENGTH "${DEEPSRC}" DEEPSRC_LEN)
CONFIGURE_FILE(simple.cxx.in ${DEEPSRC} COPYONLY) CONFIGURE_FILE(simple.cxx.in ${DEEPSRC} COPYONLY)
# Watcom WMake seems to have problems with long command lines. Just
# disable this part of the test until it is resolved.
IF(${CMAKE_GENERATOR} MATCHES "Watcom WMake")
SET(DEEPSRC "")
ADD_DEFINITIONS(-DNO_DEEPSRC)
ENDIF(${CMAKE_GENERATOR} MATCHES "Watcom WMake")
ADD_LIBRARY(testlib testlib.cxx) ADD_LIBRARY(testlib testlib.cxx)
ADD_EXECUTABLE (simple simple.cxx ../simple.cxx ${DEEPSRC}) ADD_EXECUTABLE (simple simple.cxx ../simple.cxx ${DEEPSRC})
TARGET_LINK_LIBRARIES(simple testlib outlib) TARGET_LINK_LIBRARIES(simple testlib outlib)

4
Tests/OutOfSource/OutOfSourceSubdir/simple.cxx
View File

@ -5,7 +5,9 @@
#include "testdp.h" #include "testdp.h"
extern int simple(); extern int simple();
#ifndef NO_DEEPSRC
extern int simple2(); extern int simple2();
#endif
extern "C" int outlib(); extern "C" int outlib();
int main () int main ()
@ -27,9 +29,11 @@ int main ()
{ {
return -4; return -4;
} }
#ifndef NO_DEEPSRC
if(simple2() != 789) if(simple2() != 789)
{ {
return -5; return -5;
} }
#endif
return 0; return 0;
} }