diff options
| author | sb <sb@openoffice.org> | 2010-03-04 22:13:08 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-03-04 22:13:08 +0100 |
| commit | dcb5dede733af342c5f555f1c4729a51156d3f61 (patch) | |
| tree | 108b6668ac4d6ff95e1b601850cbaed8edca801a /solenv | |
| parent | sb118: we need the same STL as cppunit, so we need --without-stlport. Add che... (diff) | |
| download | core-dcb5dede733af342c5f555f1c4729a51156d3f61.tar.gz core-dcb5dede733af342c5f555f1c4729a51156d3f61.zip | |
sb118: #i109791# improved CPPUNIT_CFLAGS handling
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/config/ssolar.cmn | 1 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index cbcdbb88078c..985eef85357b 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -98,6 +98,7 @@ common ENABLE_NAS ENABLE_PCH SYSTEM_CURL + SYSTEM_CPPUNIT SYSTEM_FREETYPE FREETYPE_CFLAGS FREETYPE_LIBS diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 773dafc623fb..1d4c1d50422f 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1347,6 +1347,10 @@ $(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/x XML_APIS_JAR*=$(SOLARBINDIR)/xml-apis.jar XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar +.IF "$(SYSTEM_CPPUNIT)" != "YES" +CPPUNIT_CFLAGS = +.END + # workaround for strange dmake bug: # if the previous block was a rule or a target, "\#" isn't recognized # as an escaped "#". if it was an assignment, escaping works... |