From c2a251d655e760bb3f8d4bd90371d86aedfdeae1 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 18 Nov 2019 13:55:55 +0100 Subject: Build deps: Actually tweak EOL style Seems that `git am` will force native EOL. --- .../build_environment/patches/opencollada.diff | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'build_files/build_environment') diff --git a/build_files/build_environment/patches/opencollada.diff b/build_files/build_environment/patches/opencollada.diff index 2d9bea8d2e1..56f352febfc 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 -- cgit v1.2.3