Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2018-08-15 21:32:34 +0300
committerRay Molenkamp <github@lazydodo.com>2018-08-15 21:32:34 +0300
commitf634d4a8a62c78b8fec54ae3283b104a0e82b399 (patch)
tree343e2167c39656a3dae7d3bfac14153babd69085 /build_files/build_environment/patches/tinyxml.diff
parentc3e3ccd42ccfcb6725f4d2d3b96afbf6339304a6 (diff)
build_environment: opencolorio 1.1.0
-Moved from dynamic link to static on windows -gained lcms/tinyxml/yamlcpp deps, since we need a little more control over the build flags than the build-in options will provide.
Diffstat (limited to 'build_files/build_environment/patches/tinyxml.diff')
-rw-r--r--build_files/build_environment/patches/tinyxml.diff34
1 files changed, 34 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/tinyxml.diff b/build_files/build_environment/patches/tinyxml.diff
new file mode 100644
index 00000000000..9965f3e610e
--- /dev/null
+++ b/build_files/build_environment/patches/tinyxml.diff
@@ -0,0 +1,34 @@
+diff -Naur tinyxml.orig/CMakeLists.txt tinyxml/CMakeLists.txt
+--- tinyxml.orig/CMakeLists.txt 1969-12-31 16:00:00.000000000 -0800
++++ tinyxml/CMakeLists.txt 2013-06-18 17:10:59.000000000 -0700
+@@ -0,0 +1,30 @@
++project(tinyxml)
++
++cmake_minimum_required(VERSION 2.8)
++
++add_library(tinyxml
++ STATIC
++ tinystr.cpp
++ tinyxml.cpp
++ tinyxmlerror.cpp
++ tinyxmlparser.cpp)
++
++set(TINYXML_COMPILE_FLAGS "-DTIXML_USE_STL")
++
++if(UNIX)
++ set(TINYXML_COMPILE_FLAGS "${TINYXML_COMPILE_FLAGS} -fPIC -fvisibility=hidden")
++endif()
++
++if(OCIO_INLINES_HIDDEN AND UNIX)
++ set(TINYXML_COMPILE_FLAGS "${TINYXML_COMPILE_FLAGS} -fvisibility-inlines-hidden")
++endif()
++
++set_target_properties(tinyxml PROPERTIES
++ COMPILE_FLAGS "${TINYXML_COMPILE_FLAGS}")
++
++install(TARGETS
++ tinyxml
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++install(FILES
++ tinyxml.h tinystr.h
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/include)