From cb01f15217f0bc21d46dee8e7e8985a6d6f74413 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Sat, 7 Mar 2015 14:09:11 +0100 Subject: [PATCH] Fix patch application --- external/squirrel/CMakeLists.txt | 13 ++++++++++++- .../squirrel/patches}/squirrel_coverity.patch | 0 2 files changed, 12 insertions(+), 1 deletion(-) rename {patches/squirrel => external/squirrel/patches}/squirrel_coverity.patch (100%) diff --git a/external/squirrel/CMakeLists.txt b/external/squirrel/CMakeLists.txt index 1457b30f0..0651f2e73 100644 --- a/external/squirrel/CMakeLists.txt +++ b/external/squirrel/CMakeLists.txt @@ -23,8 +23,19 @@ SET(APPLY_COVERITY_PATCH TRUE) SET(PATCH_COMMAND patch -p1 --forward -i) FIND_PROGRAM(PATCH_EXECUTABLE patch) + IF(PATCH_EXECUTABLE AND APPLY_COVERITY_PATCH) - EXECUTE_PROCESS(COMMAND ${PATCH_COMMAND} patches/squirrel/squirrel_coverity.patch) + # Find patch files + FILE(GLOB_RECURSE PATCH_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/patches/*.patch + ${CMAKE_CURRENT_SOURCE_DIR}/patches/*.diff) + + # Execute patch files + FOREACH(file ${PATCH_FILES}) + MESSAGE(STATUS "Found ${file}") + EXECUTE_PROCESS(COMMAND ${PATCH_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/${file}) + ENDFOREACH(file) + ENDIF(PATCH_EXECUTABLE AND APPLY_COVERITY_PATCH) ## Add include/ to include directories diff --git a/patches/squirrel/squirrel_coverity.patch b/external/squirrel/patches/squirrel_coverity.patch similarity index 100% rename from patches/squirrel/squirrel_coverity.patch rename to external/squirrel/patches/squirrel_coverity.patch -- 2.11.0