Build deps: Actually tweak EOL style
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Nov 2019 12:55:55 +0000 (13:55 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Nov 2019 12:55:55 +0000 (13:55 +0100)
Seems that `git am` will force native EOL.

build_files/build_environment/patches/opencollada.diff

index 2d9bea8d2e152eebaa914d452cd4ca4b6dc32cc8..56f352febfc61101892ac6fae9abaf6fd48750fb 100644 (file)
@@ -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()\r
\r
+ #adding PCRE\r
+-find_package(PCRE)\r
++#find_package(PCRE)\r
+ if (PCRE_FOUND)\r
+       message(STATUS "SUCCESSFUL: PCRE found")\r
+ else ()  # if pcre not found building its local copy from ./Externals\r
+-      if (WIN32 OR APPLE)\r
++      if (1)\r
+               message("WARNING: Native PCRE not found, taking PCRE from ./Externals")\r
+               add_definitions(-DPCRE_STATIC)\r
+               add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)\r
 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