[Libreoffice-commits] core.git: Branch 'feature/breakpad' - 3 commits - external/breakpad external/Module_external.mk

[David Tardon]

 external/Module_external.mk                   |    1 +
 external/breakpad/ExternalProject_breakpad.mk |    4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 7c47ff349659f3507063176f8f82e509a0192e82
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Feb 15 07:52:34 2016 +0100

    AFAICS breakpad does use neither glew nor libgltf
    
    Change-Id: Icfea7b921d990a3d7adcbebbda2cddbc62d8ea39

diff --git a/external/breakpad/ExternalProject_breakpad.mk b/external/breakpad/ExternalProject_breakpad.mk
index 350ad99..c0ea5df 100644
--- a/external/breakpad/ExternalProject_breakpad.mk
+++ b/external/breakpad/ExternalProject_breakpad.mk
@@ -22,8 +22,6 @@ $(call gb_ExternalProject_get_state_target,breakpad,build) :
 			/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
 			$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
 			$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
-			'/p:AdditionalIncludeDirectories=$(subst $(WHITESPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes))))' \
-			/p:AdditionalLibraryDirectories=$(if $(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
 	,build/win32)
 
 else # !ifeq($(COM),MSC)
commit fad147634d10c80a307162e63b926f9f37b00edb
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Feb 15 07:50:25 2016 +0100

    _use_autoconf is not needed
    
    It enables building with gcc wrappers on Windows, which is not used here
    
    Change-Id: I8b27ae9f8952fd3fbae37d17fdddfc1d3b9d5fb6

diff --git a/external/breakpad/ExternalProject_breakpad.mk b/external/breakpad/ExternalProject_breakpad.mk
index 713276e..350ad99 100644
--- a/external/breakpad/ExternalProject_breakpad.mk
+++ b/external/breakpad/ExternalProject_breakpad.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,breakpad))
 
-$(eval $(call gb_ExternalProject_use_autoconf,breakpad,build))
-
 $(eval $(call gb_ExternalProject_register_targets,breakpad,\
 	build \
 ))
commit c8490a4c675df37293de20214cf7664084220b18
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Feb 15 07:48:58 2016 +0100

    actually allow gbuild to see breakpad makefiles...
    
    Change-Id: I12ba34f30508c0a888445a2d9b68d48807b74e8c

diff --git a/external/Module_external.mk b/external/Module_external.mk
index 6528629..2512b85 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,APACHE_COMMONS,apache-commons) \
 	$(call gb_Helper_optional,APR,apr) \
 	$(call gb_Helper_optional,BOOST,boost) \
+	$(call gb_Helper_optional,BREAKPAD,breakpad) \
 	$(call gb_Helper_optional,BSH,beanshell) \
 	$(call gb_Helper_optional,BZIP2,bzip2) \
 	$(call gb_Helper_optional,CAIRO,cairo) \