[Libreoffice-commits] core.git: Branch 'feature/emfplusprimitiveparser' - emfio/CppunitTest_emfio_emf_test.mk emfio/CppunitTest_emfio_wmf_test.mk

Armin Le Grand Armin.Le.Grand at cib.de
Fri Jun 23 12:05:03 UTC 2017 

 emfio/CppunitTest_emfio_emf_test.mk |   24 +++++++-------
 emfio/CppunitTest_emfio_wmf_test.mk |   58 ++++++++++++++++++------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

New commits:
commit a5283746adc84097da3fb4d5c943dcd9a8e3a484
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Fri Jun 23 14:02:38 2017 +0200

    emfplus: more corrections due to linux build
    
    Change-Id: Ib2c3bff23043638d315405b5a91b2596e92f7ffa

diff --git a/emfio/CppunitTest_emfio_emf_test.mk b/emfio/CppunitTest_emfio_emf_test.mk
index 6965613e9cd8..49cf14f90e51 100644
--- a/emfio/CppunitTest_emfio_emf_test.mk
+++ b/emfio/CppunitTest_emfio_emf_test.mk
@@ -7,31 +7,31 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,emfio))
+$(eval $(call gb_CppunitTest_CppunitTest,emfio_emf))
 
-$(eval $(call gb_CppunitTest_set_componentfile,emfio,emfio/emfio))
+$(eval $(call gb_CppunitTest_set_componentfile,emfio_emf,emfio/emfio))
 
-$(eval $(call gb_CppunitTest_set_include,emfio,\
+$(eval $(call gb_CppunitTest_set_include,emfio_emf,\
     $$(INCLUDE) \
     -I$(SRCDIR)/emfio/inc \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,emfio,\
+$(eval $(call gb_CppunitTest_use_externals,emfio_emf,\
     boost_headers \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,emfio,\
+$(eval $(call gb_CppunitTest_add_exception_objects,emfio_emf,\
     emfio/qa/cppunit/emf/EmfImportTest \
 ))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,emfio))
+$(eval $(call gb_CppunitTest_use_sdk_api,emfio_emf))
 
-$(eval $(call gb_CppunitTest_use_library_objects,emfio,\
+$(eval $(call gb_CppunitTest_use_library_objects,emfio_emf,\
     emfio \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,emfio,\
+$(eval $(call gb_CppunitTest_use_libraries,emfio_emf,\
     basegfx \
     drawinglayer \
     cppu \
@@ -46,10 +46,10 @@ $(eval $(call gb_CppunitTest_use_libraries,emfio,\
     utl \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,emfio))
-$(eval $(call gb_CppunitTest_use_vcl,emfio))
+$(eval $(call gb_CppunitTest_use_ure,emfio_emf))
+$(eval $(call gb_CppunitTest_use_vcl,emfio_emf))
 
-$(eval $(call gb_CppunitTest_use_components,emfio,\
+$(eval $(call gb_CppunitTest_use_components,emfio_emf,\
     configmgr/source/configmgr \
     dtrans/util/mcnttype \
     framework/util/fwk \
@@ -63,6 +63,6 @@ $(eval $(call gb_CppunitTest_use_components,emfio,\
     unotools/util/utl \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,emfio))
+$(eval $(call gb_CppunitTest_use_configuration,emfio_emf))
 
 # vim: set noet sw=4 ts=4:
diff --git a/emfio/CppunitTest_emfio_wmf_test.mk b/emfio/CppunitTest_emfio_wmf_test.mk
index 82f53ce2f3fe..c24dd19acfef 100644
--- a/emfio/CppunitTest_emfio_wmf_test.mk
+++ b/emfio/CppunitTest_emfio_wmf_test.mk
@@ -7,32 +7,32 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,emfio))
+$(eval $(call gb_CppunitTest_CppunitTest,emfio_wmf))
 
-$(eval $(call gb_CppunitTest_set_componentfile,emfio,emfio/emfio))
+$(eval $(call gb_CppunitTest_set_componentfile,emfio_wmf,emfio/emfio))
 
-$(eval $(call gb_CppunitTest_set_include,emfio,\
+$(eval $(call gb_CppunitTest_set_include,emfio_wmf,\
     $$(INCLUDE) \
     -I$(SRCDIR)/emfio/inc \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,emfio,\
+$(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
     boost_headers \
     libxml2 \
     $(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
 ))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,emfio, \
+$(eval $(call gb_CppunitTest_add_exception_objects,emfio_wmf, \
     emfio/qa/cppunit/wmf/wmfimporttest \
 ))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,emfio))
+$(eval $(call gb_CppunitTest_use_sdk_api,emfio_wmf))
 
-$(eval $(call gb_CppunitTest_use_library_objects,emfio, \
+$(eval $(call gb_CppunitTest_use_library_objects,emfio_wmf, \
     emfio \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,emfio,\
+$(eval $(call gb_CppunitTest_use_libraries,emfio_wmf,\
     $(call gb_Helper_optional,BREAKPAD, \
                crashreport) \
     basegfx \
@@ -58,7 +58,7 @@ $(eval $(call gb_CppunitTest_use_libraries,emfio,\
     xmlreader \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,emfio,\
+$(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
     $(if $(filter LINUX MACOSX %BSD SOLARIS,$(OS)), \
             curl) \
     jpeg \
@@ -69,7 +69,7 @@ $(eval $(call gb_CppunitTest_use_externals,emfio,\
 ))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_CppunitTest_add_libs,emfio,\
+$(eval $(call gb_CppunitTest_add_libs,emfio_wmf,\
     -framework IOKit \
     -F/System/Library/PrivateFrameworks \
     -framework CoreUI \
@@ -78,12 +78,12 @@ $(eval $(call gb_CppunitTest_add_libs,emfio,\
 endif
 
 ifeq ($(ENABLE_JAVA),TRUE)
-$(eval $(call gb_CppunitTest_use_libraries,emfio,\
+$(eval $(call gb_CppunitTest_use_libraries,emfio_wmf,\
     jvmaccess \
 ))
 endif
 
-$(eval $(call gb_CppunitTest_use_externals,emfio,\
+$(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
     gio \
     graphite \
     harfbuzz \
@@ -91,30 +91,30 @@ $(eval $(call gb_CppunitTest_use_externals,emfio,\
     lcms2 \
 ))
 ifeq ($(ENABLE_HEADLESS),)
-$(eval $(call gb_CppunitTest_use_externals,emfio,\
+$(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
      epoxy \
  ))
 endif
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_CppunitTest_use_system_darwin_frameworks,emfio,\
+$(eval $(call gb_CppunitTest_use_system_darwin_frameworks,emfio_wmf,\
     ApplicationServices \
 ))
-$(eval $(call gb_CppunitTest_use_system_darwin_frameworks,emfio,\
+$(eval $(call gb_CppunitTest_use_system_darwin_frameworks,emfio_wmf,\
     $(if $(filter X86_64,$(CPUNAME)),,QuickTime) \
     Cocoa \
     Carbon \
     CoreFoundation \
 ))
 ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
-$(eval $(call gb_CppunitTest_use_libraries,emfio,\
+$(eval $(call gb_CppunitTest_use_libraries,emfio_wmf,\
     AppleRemote \
 ))
 endif
 endif
 
 ifeq ($(USING_X11),TRUE)
-$(eval $(call gb_CppunitTest_use_externals,emfio,\
+$(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
     cairo \
     cups \
     dbus \
@@ -125,14 +125,14 @@ $(eval $(call gb_CppunitTest_use_externals,emfio,\
 endif
 
 ifeq ($(ENABLE_HEADLESS),TRUE)
-$(eval $(call gb_CppunitTest_use_externals,emfio,\
+$(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
     cairo \
     freetype \
     fontconfig \
 ))
 else
 ifeq ($(OS),LINUX)
-$(eval $(call gb_CppunitTest_add_libs,emfio,\
+$(eval $(call gb_CppunitTest_add_libs,emfio_wmf,\
     -lm \
     -ldl \
     -lpthread \
@@ -142,12 +142,12 @@ endif
 endif
 
 ifeq ($(OS),ANDROID)
-$(eval $(call gb_CppunitTest_add_libs,emfio,\
+$(eval $(call gb_CppunitTest_add_libs,emfio_wmf,\
     -llog \
     -landroid \
     -llo-bootstrap \
 ))
-$(eval $(call gb_CppunitTest_use_externals,emfio,\
+$(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
     cairo \
     fontconfig \
     freetype \
@@ -156,14 +156,14 @@ $(eval $(call gb_CppunitTest_use_externals,emfio,\
 endif
 
 ifeq ($(OS),IOS)
-$(eval $(call gb_CppunitTest_use_system_darwin_frameworks,emfio,\
+$(eval $(call gb_CppunitTest_use_system_darwin_frameworks,emfio_wmf,\
     UIKit \
     CoreFoundation \
 ))
 endif
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_system_win32_libs,emfio,\
+$(eval $(call gb_CppunitTest_use_system_win32_libs,emfio_wmf,\
     advapi32 \
     crypt32 \
     gdi32 \
@@ -183,7 +183,7 @@ $(eval $(call gb_CppunitTest_use_system_win32_libs,emfio,\
 endif
 
 ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
-$(eval $(call gb_CppunitTest_add_libs,emfio,\
+$(eval $(call gb_CppunitTest_add_libs,emfio_wmf,\
     -lm $(DLOPEN_LIBS) \
     -lpthread \
     -lX11 \
@@ -191,27 +191,27 @@ $(eval $(call gb_CppunitTest_add_libs,emfio,\
 ))
 endif
 
-$(eval $(call gb_CppunitTest_use_ure,emfio))
+$(eval $(call gb_CppunitTest_use_ure,emfio_wmf))
 
-$(eval $(call gb_CppunitTest_use_components,emfio,\
+$(eval $(call gb_CppunitTest_use_components,emfio_wmf,\
     configmgr/source/configmgr \
     i18npool/util/i18npool \
     ucb/source/core/ucb1 \
     unotools/util/utl \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,emfio))
+$(eval $(call gb_CppunitTest_use_configuration,emfio_wmf))
 
 # See gb_CppunitTest__use_vcl (solenv/gbuild/CppunitTest.mk; headless):
 ifeq ($(USING_X11),TRUE)
-$(call gb_CppunitTest_get_target,emfio): \
+$(call gb_CppunitTest_get_target,emfio_wmf): \
     $(call gb_Library_get_target,desktop_detector)
 endif
 
 # Hack to suppress ASan ODR violation warnings about symbols present in both the
 # vcl objects linked into this test library and the vcl library (which gets
 # dynamically loaded during the test):
-$(call gb_CppunitTest_get_target,emfio): \
+$(call gb_CppunitTest_get_target,emfio_wmf): \
     EXTRA_ENV_VARS := \
         ASAN_OPTIONS="$${ASAN_OPTIONS+$$ASAN_OPTIONS:}"detect_odr_violation=0

More information about the Libreoffice-commits mailing list