| 1 |
commit: 402183f38c721910fe038ed4ce04e0a98a37c584 |
| 2 |
Author: Horea Christian <chr <AT> chymera <DOT> eu> |
| 3 |
AuthorDate: Mon Nov 25 17:57:04 2019 +0000 |
| 4 |
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Nov 25 17:57:04 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=402183f3 |
| 7 |
|
| 8 |
sci-biology/ants: added patch files |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 11 |
Signed-off-by: Horea Christian <chr <AT> chymera.eu> |
| 12 |
|
| 13 |
.../ants/files/ants-2.3.1_p20191013-logic.patch | 37 ++++++++++++++++++++ |
| 14 |
.../ants/files/ants-2.3.1_p20191013-paths.patch | 40 ++++++++++++++++++++++ |
| 15 |
2 files changed, 77 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sci-biology/ants/files/ants-2.3.1_p20191013-logic.patch b/sci-biology/ants/files/ants-2.3.1_p20191013-logic.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000..932da9954 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sci-biology/ants/files/ants-2.3.1_p20191013-logic.patch |
| 22 |
@@ -0,0 +1,37 @@ |
| 23 |
+From b2c828ff8e5ce537d7096af04b086e965fede9e8 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: "Gabriel A. Devenyi" <gdevenyi@×××××.com> |
| 25 |
+Date: Mon, 7 Oct 2019 22:01:51 -0400 |
| 26 |
+Subject: [PATCH] Fix install logic |
| 27 |
+ |
| 28 |
+--- |
| 29 |
+ ANTS.cmake | 3 ++- |
| 30 |
+ SuperBuild.cmake | 2 ++ |
| 31 |
+ 2 files changed, 4 insertions(+), 1 deletion(-) |
| 32 |
+ |
| 33 |
+diff --git a/ANTS.cmake b/ANTS.cmake |
| 34 |
+index a1baf845..95ffdc74 100644 |
| 35 |
+--- a/ANTS.cmake |
| 36 |
++++ b/ANTS.cmake |
| 37 |
+@@ -172,7 +172,8 @@ install(PROGRAMS Scripts/ANTSpexec.sh |
| 38 |
+ COMPONENT SCRIPTS |
| 39 |
+ ) |
| 40 |
+ |
| 41 |
+-if(BUILD_SHARED_LIBS AND NOT (USE_SYSTEM_ITK AND USE_SYSTEM_VTK)) |
| 42 |
++#Only install ITK/VTK libraries if shared build and superbuild is used |
| 43 |
++if(BUILD_SHARED_LIBS AND ((NOT USE_SYSTEM_ITK) OR ((NOT USE_SYSTEM_VTK) AND USE_VTK))) |
| 44 |
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/../staging/lib/ |
| 45 |
+ DESTINATION lib) |
| 46 |
+ endif() |
| 47 |
+diff --git a/SuperBuild.cmake b/SuperBuild.cmake |
| 48 |
+index f4630e64..32b930c2 100644 |
| 49 |
+--- a/SuperBuild.cmake |
| 50 |
++++ b/SuperBuild.cmake |
| 51 |
+@@ -207,6 +207,8 @@ list(APPEND ${CMAKE_PROJECT_NAME}_SUPERBUILD_EP_VARS |
| 52 |
+ CMAKE_C_COMPILER_LAUNCHER:STRING |
| 53 |
+ CMAKE_CXX_COMPILER_LAUNCHER:STRING |
| 54 |
+ CMAKE_CUDA_COMPILER_LAUNCHER:STRING |
| 55 |
++ USE_SYSTEM_ITK:BOOL |
| 56 |
++ USE_SYSTEM_VTK:BOOL |
| 57 |
+ ) |
| 58 |
+ |
| 59 |
+ _expand_external_project_vars() |
| 60 |
|
| 61 |
diff --git a/sci-biology/ants/files/ants-2.3.1_p20191013-paths.patch b/sci-biology/ants/files/ants-2.3.1_p20191013-paths.patch |
| 62 |
new file mode 100644 |
| 63 |
index 000000000..aaea92808 |
| 64 |
--- /dev/null |
| 65 |
+++ b/sci-biology/ants/files/ants-2.3.1_p20191013-paths.patch |
| 66 |
@@ -0,0 +1,40 @@ |
| 67 |
+diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt |
| 68 |
+--- a/Examples/CMakeLists.txt |
| 69 |
++++ b/Examples/CMakeLists.txt |
| 70 |
+@@ -16,8 +16,9 @@ |
| 71 |
++include(GNUInstallDirs) |
| 72 |
+ install(TARGETS antsUtilities |
| 73 |
+- RUNTIME DESTINATION bin |
| 74 |
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
| 75 |
+ COMPONENT RUNTIME_antsUtilities |
| 76 |
+- LIBRARY DESTINATION lib |
| 77 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 78 |
+ COMPONENT RUNTIME_antsUtilities |
| 79 |
+- ARCHIVE DESTINATION lib |
| 80 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 81 |
+ COMPONENT DEVELOPMENT_antsUtilities |
| 82 |
+ ) |
| 83 |
+@@ -38,8 +38,8 @@ |
| 84 |
+ install(TARGETS l_${ANTS_FUNCTION_NAME} ${ANTS_FUNCTION_NAME} |
| 85 |
+- RUNTIME DESTINATION bin |
| 86 |
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
| 87 |
+ COMPONENT RUNTIME_${ANTS_FUNCTION_NAME} |
| 88 |
+- LIBRARY DESTINATION lib |
| 89 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 90 |
+ COMPONENT RUNTIME_${ANTS_FUNCTION_NAME} |
| 91 |
+- ARCHIVE DESTINATION lib |
| 92 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 93 |
+ COMPONENT DEVELOPMENT_${ANTS_FUNCTION_NAME} |
| 94 |
+ ) |
| 95 |
+@@ -61,8 +61,8 @@ |
| 96 |
+ install(TARGETS l_${ANTS_FUNCTION_NAME} ${ANTS_FUNCTION_NAME} |
| 97 |
+- RUNTIME DESTINATION bin |
| 98 |
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
| 99 |
+ COMPONENT RUNTIME_${ANTS_FUNCTION_NAME} |
| 100 |
+- LIBRARY DESTINATION lib |
| 101 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 102 |
+ COMPONENT RUNTIME_${ANTS_FUNCTION_NAME} |
| 103 |
+- ARCHIVE DESTINATION lib |
| 104 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 105 |
+ COMPONENT DEVELOPMENT_${ANTS_FUNCTION_NAME} |
| 106 |
+ ) |
Archives