mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Repository.mk: adjust layer of libraries in smoketest instset

Browse Source 
These are currently installed in the "program" dir, whether that is a
good idea or not.

Change-Id: I842bc0a72f9a6f78462ad18151cd42f85753aadf
This commit is contained in:
Michael Stahl
2013-09-18 21:01:14 +02:00
parent 30fe6781ea
commit 1b736bf55e
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Repository.mk
View File

@@ -434,16 +434,20 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif endif
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ # these libraries are packaged in the "Test" instset, in the "program" dir :-/
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
smoketest \ smoketest \
subsequenttest \
test \ test \
testtools_cppobj \
testtools_bridgetest \
testtools_constructors \
unobootstrapprotector \ unobootstrapprotector \
unoexceptionprotector \ unoexceptionprotector \
unotest \ unotest \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
subsequenttest \
testtools_cppobj \
testtools_bridgetest \
testtools_constructors \
scqahelper \ scqahelper \
)) ))

2
RepositoryExternal.mk
View File

@@ -192,7 +192,7 @@ endef
else else
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
cppunit \ cppunit \
)) ))

2
cppunit/ExternalProject_cppunit.mk
View File

@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
--disable-html-docs \ --disable-html-docs \
--disable-latex-docs \ --disable-latex-docs \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ $(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
$(if $(filter SOLARIS,$(OS)),LIBS="-lm") \ $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \
$(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \ $(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \