[Bf-blender-cvs] [8c509f98e12] master: Build_environment: Fix unwanted exports from libxml on windows.

Ray Molenkamp noreply at git.blender.org
Sat Feb 8 23:07:19 CET 2020


Commit: 8c509f98e129d1951ea590e7377a7e4c6bfdd427
Author: Ray Molenkamp
Date:   Sat Feb 8 15:04:09 2020 -0700
Branches: master
https://developer.blender.org/rB8c509f98e129d1951ea590e7377a7e4c6bfdd427

Build_environment: Fix unwanted exports from libxml on windows.

libxml puts dllexport on all its functions causing the
blender binary to export these symbols.

this patch fixes this unwanted behaviour.

Differential Revision: https://developer.blender.org/D6646

Reviewers: brecht , sergey

===================================================================

M	build_files/build_environment/patches/opencollada.diff

===================================================================

diff --git a/build_files/build_environment/patches/opencollada.diff b/build_files/build_environment/patches/opencollada.diff
index 56f352febfc..e7f563acaa1 100644
--- a/build_files/build_environment/patches/opencollada.diff
+++ b/build_files/build_environment/patches/opencollada.diff
@@ -3,19 +3,19 @@ index 95abbe2..4f14f30 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -254,11 +254,11 @@ if(USE_STATIC_MSVC_RUNTIME)
- endif()
- 
- #adding PCRE
--find_package(PCRE)
-+#find_package(PCRE)
- if (PCRE_FOUND)
- 	message(STATUS "SUCCESSFUL: PCRE found")
- else ()  # if pcre not found building its local copy from ./Externals
--	if (WIN32 OR APPLE)
-+	if (1)
- 		message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
- 		add_definitions(-DPCRE_STATIC)
- 		add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
+ endif()
+ 
+ #adding PCRE
+-find_package(PCRE)
++#find_package(PCRE)
+ if (PCRE_FOUND)
+ 	message(STATUS "SUCCESSFUL: PCRE found")
+ else ()  # if pcre not found building its local copy from ./Externals
+-	if (WIN32 OR APPLE)
++	if (1)
+ 		message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
+ 		add_definitions(-DPCRE_STATIC)
+ 		add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
 diff --git a/DAEValidator/library/include/no_warning_begin b/DAEValidator/library/include/no_warning_begin
 index 7a69c32..defb315 100644
 --- a/DAEValidator/library/include/no_warning_begin
@@ -74,3 +74,14 @@ index 897e4dcf..98a69ff1 100644
  #endif
  
  namespace opencollada
+diff -Naur orig/Externals/LibXML/CMakeLists.txt external_opencollada/Externals/LibXML/CMakeLists.txt
+--- orig/Externals/LibXML/CMakeLists.txt	2018-11-26 15:43:10 -0700
++++ external_opencollada/Externals/LibXML/CMakeLists.txt	2020-01-21 14:15:04 -0700
+@@ -9,6 +9,7 @@
+ 		-DLIBXML_SCHEMAS_ENABLED
+ 		-DLIBXML_XPATH_ENABLED
+ 		-DLIBXML_TREE_ENABLED
++		-DLIBXML_STATIC
+ 	)
+ 	
+ if(USE_STATIC_MSVC_RUNTIME)



More information about the Bf-blender-cvs mailing list