Commit ea6dded0 authored by jcfr's avatar jcfr

ENH: Use copy of upstream FindPatch module

This commit integrates the latest version of FindPatch module
from cmake/cmake!1184

It also updates the version of the python build system where the same
change was applied:

$ git shortlog b9ae615..cc93717 --no-merges
Jean-Christophe Fillion-Robin (1):
      ApplyPatches: Use copy of upstream FindPatch.cmake

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26334 3bd1e089-480b-0410-8dfb-8563597acbee
parent 1bb58ea8
......@@ -7,9 +7,9 @@
#
# The module defines the following variables:
#
# ``Patch_EXECUTABLE``, ``PATCH_EXECUTABLE``
# ``Patch_EXECUTABLE``
# Path to patch command-line executable.
# ``Patch_FOUND``, ``PATCH_FOUND``
# ``Patch_FOUND``
# True if the patch command-line executable was found.
#
# The following :prop_tgt:`IMPORTED` targets are also defined:
......@@ -29,10 +29,6 @@
set(_doc "Patch command line executable")
set(_patch_path )
if(DEFINED PATCH_EXECUTABLE)
set(Patch_EXECUTABLE ${PATCH_EXECUTABLE})
endif()
if(CMAKE_HOST_WIN32)
set(_patch_path
"$ENV{LOCALAPPDATA}/Programs/Git/bin"
......@@ -64,10 +60,6 @@ if(Patch_EXECUTABLE AND NOT TARGET Patch::patch)
set_property(TARGET Patch::patch PROPERTY IMPORTED_LOCATION ${Patch_EXECUTABLE})
endif()
if(NOT DEFINED PATCH_EXECUTABLE)
set(PATCH_EXECUTABLE ${Patch_EXECUTABLE})
endif()
unset(_patch_path)
unset(_doc)
......
......@@ -165,7 +165,7 @@ endif()
mark_as_superbuild(GIT_EXECUTABLE)
find_package(Patch REQUIRED)
mark_as_superbuild(PATCH_EXECUTABLE)
mark_as_superbuild(Patch_EXECUTABLE)
#-----------------------------------------------------------------------------
# Qt requirements
......
......@@ -128,7 +128,7 @@ if((NOT DEFINED PYTHON_INCLUDE_DIR
ExternalProject_SetIfNotDefined(
${CMAKE_PROJECT_NAME}_${proj}_GIT_TAG
"b9ae6156913a266401c3ebeabdfb83cc9883f2db"
"cc93717837469bcd36746b91739949f100e64123"
QUIET
)
......@@ -156,7 +156,7 @@ if((NOT DEFINED PYTHON_INCLUDE_DIR
-DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY}
-DENABLE_TKINTER:BOOL=${Slicer_USE_PYTHONQT_WITH_TCL}
-DENABLE_SSL:BOOL=${PYTHON_ENABLE_SSL}
-DPATCH_EXECUTABLE:FILEPATH=${PATCH_EXECUTABLE}
-DPatch_EXECUTABLE:FILEPATH=${Patch_EXECUTABLE}
${EXTERNAL_PROJECT_OPTIONAL_CMAKE_CACHE_ARGS}
# macOS
-DCMAKE_MACOSX_RPATH:BOOL=0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment