diff options
| author | Martin Felke <martin.felke@googlemail.com> | 2018-09-03 21:06:25 +0300 |
|---|---|---|
| committer | Martin Felke <martin.felke@googlemail.com> | 2018-09-03 21:06:25 +0300 |
| commit | 5aeff9291f69c13818f1299b4b4d04b381f203c4 (patch) | |
| tree | db69f0d21628715683b616963d8ff4cb21acdc02 /build_files/build_environment/patches/opencollada.diff | |
| parent | f0aef2afe9990e7700b1c2c513b901e7ffd6b2da (diff) | |
backport of new linux library build system to FM 2.79 branch
after upgrade to Linux Mint 19 locally, nothing did work anymore basically... and in order to use this with the blender docker build system, it needed the new(er) cmake based library building system.
Diffstat (limited to 'build_files/build_environment/patches/opencollada.diff')
| -rw-r--r-- | build_files/build_environment/patches/opencollada.diff | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/opencollada.diff b/build_files/build_environment/patches/opencollada.diff new file mode 100644 index 00000000000..0c91b4151fe --- /dev/null +++ b/build_files/build_environment/patches/opencollada.diff @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3fc9be5..5112ce6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -254,11 +254,11 @@ + 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.orig b/DAEValidator/library/include/no_warning_begin +index 3fc9be5..5112ce6 100644 +--- a/DAEValidator/library/include/no_warning_begin.orig 2017-05-31 16:56:39 -0600 ++++ b/DAEValidator/library/include/no_warning_begin 2017-06-07 10:18:45 -0600 +@@ -2,6 +2,9 @@ + #if defined(_WIN32) + # pragma warning(push) + # pragma warning(disable:4668) ++# if _MSC_VER >=1900 ++# pragma warning(disable:5031) ++# endif + # if defined(_MSC_VER) && defined(_DEBUG) + # pragma warning(disable:4548) + # endif |