diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-24 21:21:11 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-24 21:23:25 +0300 |
commit | d109ea5ee50f79ca9e008c7d3d4707792b9d9c36 (patch) | |
tree | bb0aef1a95389bfb38feee649cb5a07343d57c00 /build_files/build_environment | |
parent | f9b1e8f000ad636456e66e7a377814d79f7d85ac (diff) |
Fix make deps failing to build opencollada on Linux, due to line endings
The OpenCOLLADA package contains a mix of files with unix and dos line endings.
Now we mark the diff as a binary file so that the patch also contains a mix of
line endings that matches the package.
Diffstat (limited to 'build_files/build_environment')
-rw-r--r-- | build_files/build_environment/patches/.gitattributes | 2 | ||||
-rw-r--r-- | build_files/build_environment/patches/opencollada.diff | 103 |
2 files changed, 54 insertions, 51 deletions
diff --git a/build_files/build_environment/patches/.gitattributes b/build_files/build_environment/patches/.gitattributes new file mode 100644 index 00000000000..beb2d800f5b --- /dev/null +++ b/build_files/build_environment/patches/.gitattributes @@ -0,0 +1,2 @@ +# Files contains mixed line endings, patch needs to preserve them to apply. +opencollada.diff binary diff --git a/build_files/build_environment/patches/opencollada.diff b/build_files/build_environment/patches/opencollada.diff index e7f563acaa1..cd4cc2c1652 100644 --- a/build_files/build_environment/patches/opencollada.diff +++ b/build_files/build_environment/patches/opencollada.diff @@ -3,19 +3,32 @@ 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/CMakeLists.txt b/DAEValidator/CMakeLists.txt +index 03ad540..f7d05cf 100644 +--- a/DAEValidator/CMakeLists.txt ++++ b/DAEValidator/CMakeLists.txt +@@ -98,7 +98,7 @@ if (WIN32) + # C4710: 'function' : function not inlined + # C4711: function 'function' selected for inline expansion + # C4820: 'bytes' bytes padding added after construct 'member_name' +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820") + else () + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror") + endif () 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 @@ -30,34 +43,8 @@ index 7a69c32..defb315 100644 # if defined(_MSC_VER) && defined(_DEBUG) # pragma warning(disable:4548) # endif -diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp -index 1f9a3ee..d151e9a 100644 ---- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp -+++ b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp -@@ -1553,7 +1553,7 @@ namespace GeneratedSaxParser - #if defined(COLLADABU_OS_WIN) && !defined(__MINGW32__) - return _isnan( value ) ? true : false; - #else --#ifdef isnan -+#if defined(isnan) || defined(__APPLE__) - return isnan( value ); - #else - return std::isnan(value); -diff --git a/DAEValidator/CMakeLists.txt b/DAEValidator/CMakeLists.txt -index 03ad540f..f7d05cfb 100644 ---- a/DAEValidator/CMakeLists.txt -+++ b/DAEValidator/CMakeLists.txt -@@ -98,7 +98,7 @@ if (WIN32) - # C4710: 'function' : function not inlined - # C4711: function 'function' selected for inline expansion - # C4820: 'bytes' bytes padding added after construct 'member_name' -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820") - else () - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror") - endif () diff --git a/DAEValidator/library/src/ArgumentParser.cpp b/DAEValidator/library/src/ArgumentParser.cpp -index 897e4dcf..98a69ff1 100644 +index 897e4dc..98a69ff 100644 --- a/DAEValidator/library/src/ArgumentParser.cpp +++ b/DAEValidator/library/src/ArgumentParser.cpp @@ -6,10 +6,10 @@ @@ -74,14 +61,28 @@ 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) +diff --git a/Externals/LibXML/CMakeLists.txt b/Externals/LibXML/CMakeLists.txt +index 40081e7..e1d1bfa 100644 +--- a/Externals/LibXML/CMakeLists.txt ++++ b/Externals/LibXML/CMakeLists.txt +@@ -9,6 +9,7 @@ add_definitions( + -DLIBXML_SCHEMAS_ENABLED
+ -DLIBXML_XPATH_ENABLED
+ -DLIBXML_TREE_ENABLED
++ -DLIBXML_STATIC
+ )
+
+ if(USE_STATIC_MSVC_RUNTIME)
+diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp +index 1f9a3ee..d151e9a 100644 +--- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp ++++ b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp +@@ -1553,7 +1553,7 @@ namespace GeneratedSaxParser + #if defined(COLLADABU_OS_WIN) && !defined(__MINGW32__) + return _isnan( value ) ? true : false; + #else +-#ifdef isnan ++#if defined(isnan) || defined(__APPLE__) + return isnan( value ); + #else + return std::isnan(value); |