From 4b83ec95284d30cf3c40c9a978972c5eb798e0ad Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Fri, 23 Dec 2016 09:17:09 +0100
Subject: [PATCH] PKG: update post_install step of ITK
---
SuperBuild/CMake/External_itk.cmake | 17 +++++------------
SuperBuild/CMake/post_install.cmake | 25 +++++++++----------------
2 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/SuperBuild/CMake/External_itk.cmake b/SuperBuild/CMake/External_itk.cmake
index c33559d6e5..8f0c9e404a 100644
--- a/SuperBuild/CMake/External_itk.cmake
+++ b/SuperBuild/CMake/External_itk.cmake
@@ -164,18 +164,11 @@ ExternalProject_Add(ITK
SUPERBUILD_PATCH_SOURCE(ITK)
-ExternalProject_Add_Step(ITK POST_INSTALL_2
+set(DIR_LIST "${SB_INSTALL_PREFIX}/lib/cmake/ITK-4.10|${SB_INSTALL_PREFIX}/lib/cmake/ITK-4.10/Modules")
+ExternalProject_Add_Step(ITK POST_INSTALL
COMMAND ${CMAKE_COMMAND}
- -DPATCH_DIR=${SB_INSTALL_PREFIX}/lib/cmake/ITK-4.10
- -DMATCH=${SB_INSTALL_PREFIX}
- -DPATH_STRIP_COUNT=3
- -P ${CMAKE_SOURCE_DIR}/CMake/post_install.cmake
- DEPENDEES install)
-
-ExternalProject_Add_Step(ITK POST_INSTALL_1
- COMMAND ${CMAKE_COMMAND}
- -DPATCH_DIR=${SB_INSTALL_PREFIX}/lib/cmake/ITK-4.10/Modules
- -DMATCH=${SB_INSTALL_PREFIX}
- -DPATH_STRIP_COUNT=4
+ -DP_DIRS=${DIR_LIST}
+ -DP_MATCH=${SB_INSTALL_PREFIX}
+ -DP_REPLACE=ITK_INSTALL_PREFIX
-P ${CMAKE_SOURCE_DIR}/CMake/post_install.cmake
DEPENDEES install)
diff --git a/SuperBuild/CMake/post_install.cmake b/SuperBuild/CMake/post_install.cmake
index d81b3004b5..e211e653fd 100644
--- a/SuperBuild/CMake/post_install.cmake
+++ b/SuperBuild/CMake/post_install.cmake
@@ -1,22 +1,15 @@
+string(REPLACE "|" ";" P_DIRS ${P_DIRS})
+
+foreach( p_dir ${P_DIRS} )
set(file_list)
-file(GLOB file_list "${PATCH_DIR}/*.cmake")
-foreach(cmake_file ${file_list})
+file( GLOB file_list "${p_dir}/*.cmake" )
+foreach( cmake_file ${file_list} )
file(STRINGS "${cmake_file}" MATCH_FOUND REGEX "${MATCH}")
if(MATCH_FOUND)
file(STRINGS "${cmake_file}" cmake_file_CONTENTS NEWLINE_CONSUME)
- set(CODE_SNIPPET "get_filename_component(DEPS_INSTALL_DIR \"$${}{CMAKE_CURRENT_LIST_FILE}\" PATH)")
- if (PATH_STRIP_COUNT LESS 1)
- set(PATH_STRIP_COUNT 2)
- endif()
- foreach(loop_var RANGE 1 ${PATH_STRIP_COUNT})
- set(CODE_SNIPPET "${CODE_SNIPPET} \nget_filename_component(DEPS_INSTALL_DIR \"$${}{DEPS_INSTALL_DIR}\" PATH)" )
- endforeach()
- string(REPLACE "${MATCH}" "$${}{DEPS_INSTALL_DIR}" cmake_file_CONTENTS_NEW ${cmake_file_CONTENTS})
+ string(REPLACE "${P_MATCH}" "$${}{${P_REPLACE}}" cmake_file_CONTENTS ${cmake_file_CONTENTS})
file(WRITE "${cmake_file}" "# This file is modified by OTB after installation.
- \n# For example, see POST_INSTALL_* step in OTB/SuperBuild/CMake/External_itk.cmake
- \n# BEGIN CODE BLOCK FROM OTB SUPERBUILD
- \n${CODE_SNIPPET}
- \n# END CODE BLOCK FROM OTB SUPERBUILD
- \n${cmake_file_CONTENTS_NEW}")
+ \n${cmake_file_CONTENTS}")
endif()
-endforeach() #foreach(cmake_file
+endforeach() # foreach( cmake_file
+endforeach() # foreach( p_dir
--
GitLab