Default to not applying coverity patches

[ci skip]
SuperTux · Mar 30, 2015 · 438acb6 · 438acb6
1 parent 787daba
commit 438acb6
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/external/squirrel/CMakeLists.txt b/external/squirrel/CMakeLists.txt
@@ -20,24 +20,25 @@
 ## Apply patch that fixes some Coverity errors
 
 ## Apply coverity patch to Squirrel?
-SET(APPLY_COVERITY_PATCH TRUE)
-SET(PATCH_COMMAND patch -p1 --forward -i)
+SET(APPLY_COVERITY_PATCH FALSE)
 SET(WORKING_DIR WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-FIND_PROGRAM(PATCH_EXECUTABLE patch)
 
-IF(PATCH_EXECUTABLE AND APPLY_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)
+IF(APPLY_COVERITY_PATCH)
+  FIND_PROGRAM(PATCH_EXECUTABLE patch)
+  IF(PATCH_EXECUTABLE)
+    SET(PATCH_COMMAND patch -p1 --forward -i)
+    # 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 patch file ${file}.")
-    EXECUTE_PROCESS(COMMAND ${PATCH_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${WORKING_DIR})
-  ENDFOREACH(file)
-
-ENDIF(PATCH_EXECUTABLE AND APPLY_COVERITY_PATCH)
+    # Execute patch files
+    FOREACH(file ${PATCH_FILES})
+      MESSAGE(STATUS "Found patch file ${file}.")
+      EXECUTE_PROCESS(COMMAND ${PATCH_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${WORKING_DIR})
+    ENDFOREACH(file)
+  ENDIF(PATCH_EXECUTABLE)
+ENDIF(APPLY_COVERITY_PATCH)
 
 ## Add include/ to include directories