diff options
-rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
-rw-r--r-- | external/Module_external.mk | 1 | ||||
-rw-r--r-- | external/cppunit/ExternalPackage_cppunit.mk (renamed from cppunit/ExternalPackage_cppunit.mk) | 0 | ||||
-rw-r--r-- | external/cppunit/ExternalProject_cppunit.mk (renamed from cppunit/ExternalProject_cppunit.mk) | 0 | ||||
-rw-r--r-- | external/cppunit/Makefile (renamed from cppunit/Makefile) | 0 | ||||
-rw-r--r-- | external/cppunit/Module_cppunit.mk (renamed from cppunit/Module_cppunit.mk) | 6 | ||||
-rw-r--r-- | external/cppunit/README (renamed from cppunit/README) | 0 | ||||
-rw-r--r-- | external/cppunit/UnpackedTarball_cppunit.mk (renamed from cppunit/UnpackedTarball_cppunit.mk) | 12 | ||||
-rw-r--r-- | external/cppunit/android.patch (renamed from cppunit/android.patch) | 0 | ||||
-rw-r--r-- | external/cppunit/disable-dynloading.patch (renamed from cppunit/disable-dynloading.patch) | 0 | ||||
-rw-r--r-- | external/cppunit/ios.patch (renamed from cppunit/ios.patch) | 0 | ||||
-rw-r--r-- | external/cppunit/unix.patch (renamed from cppunit/unix.patch) | 0 | ||||
-rw-r--r-- | external/cppunit/windows.patch (renamed from cppunit/windows.patch) | 0 | ||||
-rw-r--r-- | external/cppunit/wundef.patch (renamed from cppunit/wundef.patch) | 0 |
14 files changed, 7 insertions, 13 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 0ec4fca64a59..ee95730f8e1b 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ cppcanvas \ cppu \ cppuhelper \ - $(call gb_Helper_optional,CPPUNIT,cppunit) \ cpputools \ $(call gb_Helper_optional,CRASHREP,crashrep) \ $(call gb_Helper_optional,CT2N,ct2n) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 7d6880eae13f..2c8b492e2e6f 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,BSH,beanshell) \ $(call gb_Helper_optional,CAIRO,cairo) \ $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional,CPPUNIT,cppunit) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/cppunit/ExternalPackage_cppunit.mk b/external/cppunit/ExternalPackage_cppunit.mk index d900e22a1fd2..d900e22a1fd2 100644 --- a/cppunit/ExternalPackage_cppunit.mk +++ b/external/cppunit/ExternalPackage_cppunit.mk diff --git a/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 649bae1dcc01..649bae1dcc01 100644 --- a/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk diff --git a/cppunit/Makefile b/external/cppunit/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/cppunit/Makefile +++ b/external/cppunit/Makefile diff --git a/cppunit/Module_cppunit.mk b/external/cppunit/Module_cppunit.mk index 53ed611fe0c1..f0af9e8ce004 100644 --- a/cppunit/Module_cppunit.mk +++ b/external/cppunit/Module_cppunit.mk @@ -9,16 +9,10 @@ $(eval $(call gb_Module_Module,cppunit)) -ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) - -ifeq ($(SYSTEM_CPPUNIT),NO) $(eval $(call gb_Module_add_targets,cppunit,\ UnpackedTarball_cppunit \ ExternalPackage_cppunit \ ExternalProject_cppunit \ )) -endif - -endif # vim: set noet sw=4 ts=4: diff --git a/cppunit/README b/external/cppunit/README index f71c260e6839..f71c260e6839 100644 --- a/cppunit/README +++ b/external/cppunit/README diff --git a/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk index 0a5f64939319..e1a77a5ea327 100644 --- a/cppunit/UnpackedTarball_cppunit.mk +++ b/external/cppunit/UnpackedTarball_cppunit.mk @@ -12,22 +12,22 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cppunit)) $(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit)) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ - cppunit/windows.patch \ - cppunit/unix.patch \ - cppunit/wundef.patch \ + external/cppunit/windows.patch \ + external/cppunit/unix.patch \ + external/cppunit/wundef.patch \ )) ifeq ($(OS),ANDROID) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ - cppunit/android.patch \ + external/cppunit/android.patch \ )) else ifeq ($(OS),IOS) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ - cppunit/ios.patch \ + external/cppunit/ios.patch \ )) endif ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ - cppunit/disable-dynloading.patch \ + external/cppunit/disable-dynloading.patch \ )) endif diff --git a/cppunit/android.patch b/external/cppunit/android.patch index 59ae4517abf1..59ae4517abf1 100644 --- a/cppunit/android.patch +++ b/external/cppunit/android.patch diff --git a/cppunit/disable-dynloading.patch b/external/cppunit/disable-dynloading.patch index a9aa37f6f45d..a9aa37f6f45d 100644 --- a/cppunit/disable-dynloading.patch +++ b/external/cppunit/disable-dynloading.patch diff --git a/cppunit/ios.patch b/external/cppunit/ios.patch index d7e355cddf44..d7e355cddf44 100644 --- a/cppunit/ios.patch +++ b/external/cppunit/ios.patch diff --git a/cppunit/unix.patch b/external/cppunit/unix.patch index 0a153ad05deb..0a153ad05deb 100644 --- a/cppunit/unix.patch +++ b/external/cppunit/unix.patch diff --git a/cppunit/windows.patch b/external/cppunit/windows.patch index c8ea6d7565dc..c8ea6d7565dc 100644 --- a/cppunit/windows.patch +++ b/external/cppunit/windows.patch diff --git a/cppunit/wundef.patch b/external/cppunit/wundef.patch index 5f701cd702d1..5f701cd702d1 100644 --- a/cppunit/wundef.patch +++ b/external/cppunit/wundef.patch |