CWS-TOOLING: integrate CWS cmcfixes77
This commit is contained in:
commit
6ce22642f9
2 changed files with 9 additions and 0 deletions
|
@ -31,6 +31,7 @@
|
|||
#include <cstdlib>
|
||||
#include <iostream>
|
||||
|
||||
#include "preextstl.h"
|
||||
#include "cppunit/CompilerOutputter.h"
|
||||
#include "cppunit/TestResult.h"
|
||||
#include "cppunit/TestResultCollector.h"
|
||||
|
@ -38,6 +39,7 @@
|
|||
#include "cppunit/extensions/TestFactoryRegistry.h"
|
||||
#include "cppunit/plugin/PlugInManager.h"
|
||||
#include "cppunit/portability/Stream.h"
|
||||
#include "postextstl.h"
|
||||
#include "osl/thread.h"
|
||||
#include "rtl/process.h"
|
||||
#include "rtl/string.hxx"
|
||||
|
|
|
@ -33,6 +33,13 @@ ENABLE_EXCEPTIONS = TRUE
|
|||
|
||||
.INCLUDE: settings.mk
|
||||
|
||||
#building with stlport, but cppunit was not built with stlport
|
||||
.IF "$(USE_SYSTEM_STL)"!="YES"
|
||||
.IF "$(SYSTEM_CPPUNIT)"=="YES"
|
||||
CFLAGSCXX+=-DADAPT_EXT_STL
|
||||
.ENDIF
|
||||
.ENDIF
|
||||
|
||||
CFLAGSCXX += $(CPPUNIT_CFLAGS)
|
||||
|
||||
OBJFILES = $(APP1OBJS)
|
||||
|
|
Loading…
Reference in a new issue