Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ITK] solve itkeigen packaging pb #1113

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions superbuild/patches/ITK.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From 95422e39c8ff0aff6b51da2998a2b20d3524fc73 Mon Sep 17 00:00:00 2001
From: Mathilde Merle <[email protected]>
Date: Tue, 21 Mar 2023 13:24:22 +0100
Subject: [PATCH] ITK

---
CMake/itkExternal_Eigen3.cmake | 2 +-
Modules/ThirdParty/KWSys/src/CMakeLists.txt | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMake/itkExternal_Eigen3.cmake b/CMake/itkExternal_Eigen3.cmake
index 66fae44b51..9649b4c35d 100644
--- a/CMake/itkExternal_Eigen3.cmake
+++ b/CMake/itkExternal_Eigen3.cmake
@@ -21,7 +21,7 @@ else()
# _eigen3_cmake_install_prefix work also with relative CMAKE_INSTALL_PREFIX
get_filename_component(_eigen3_cmake_install_prefix
${CMAKE_INSTALL_PREFIX} ABSOLUTE BASE_DIR ${PROJECT_BINARY_DIR})
- set(_eigen3_cmake_install_includedir ${ITK_INSTALL_INCLUDE_DIR})
+ set(_eigen3_cmake_install_includedir ${ITK_BINARY_DIR})
set(_eigen3_cmake_install_datadir ${ITK_INSTALL_PACKAGE_DIR}/Modules)
set(_eigen3_source_dir "${ITK_SOURCE_DIR}/Modules/ThirdParty/Eigen3/src/itkeigen")
set(_eigen3_build_dir "${ITK_BINARY_DIR}/ITKInternalEigen3-build")
diff --git a/Modules/ThirdParty/KWSys/src/CMakeLists.txt b/Modules/ThirdParty/KWSys/src/CMakeLists.txt
index 3c806d816d..6096ec57df 100644
--- a/Modules/ThirdParty/KWSys/src/CMakeLists.txt
+++ b/Modules/ThirdParty/KWSys/src/CMakeLists.txt
@@ -24,7 +24,9 @@ set(KWSYS_INSTALL_COMPONENT_NAME_DEVELOPMENT Development)
set(KWSYS_PROPERTIES_C WINDOWS_EXPORT_ALL_SYMBOLS FALSE)
set( _macosx_rpath 1)
if(DEFINED CMAKE_MACOSX_RPATH AND NOT "${CMAKE_MACOSX_RPATH}" STREQUAL "")
- set(_macosx_rpath ${CMAKE_MACOSX_RPATH})
+ if (NOT CMAKE_MACOSX_RPATH)
+ set(_macosx_rpath 0)
+ endif()
endif()
set(KWSYS_PROPERTIES_CXX MACOSX_RPATH ${_macosx_rpath} WINDOWS_EXPORT_ALL_SYMBOLS FALSE)

--
2.25.1

15 changes: 0 additions & 15 deletions superbuild/patches/ITK_Mac.patch

This file was deleted.

5 changes: 3 additions & 2 deletions superbuild/projects_modules/ITK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ set(cmake_args
-DModule_ITKReview:BOOL=ON
-DModule_ITKVtkGlue:BOOL=ON
-DITK_LEGACY_REMOVE:BOOL=ON
-DITK_INSTALL_PACKAGE_DIR=${EP_PATH_BUILD}/${ep} # for itkeigen at packaging
)

set(cmake_cache_args
-DVTK_DIR:PATH=${VTK_DIR}
)
Expand All @@ -76,7 +77,7 @@ set(cmake_cache_args
## Check if patch has to be applied
## #############################################################################

ep_GeneratePatchCommand(${ep} ${ep}_PATCH_COMMAND ITK_Mac.patch)
ep_GeneratePatchCommand(${ep} ${ep}_PATCH_COMMAND ITK.patch)

## #############################################################################
## Add external-project
Expand Down