diff options
| author |   Horea Christian <chr@chymera.eu> | 2019-11-25 18:57:04 +0100 |
|---|---|---|
| committer | Horea Christian <chr@chymera.eu> | 2019-11-25 18:57:04 +0100 |
| commit | 402183f38c721910fe038ed4ce04e0a98a37c584 (patch) | |
| tree | b2e2b313b71d2022ca64e44b237e7c926331c4b9 | |
| parent | sci-biology/ants: version bump 2.3.1_p20191013 (diff) | |
| download | sci-402183f38c721910fe038ed4ce04e0a98a37c584.tar.gz sci-402183f38c721910fe038ed4ce04e0a98a37c584.tar.bz2 sci-402183f38c721910fe038ed4ce04e0a98a37c584.zip | |
sci-biology/ants: added patch files
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Horea Christian <chr@chymera.eu>
| -rw-r--r-- | sci-biology/ants/files/ants-2.3.1_p20191013-logic.patch | 37 | ||||
| -rw-r--r-- | sci-biology/ants/files/ants-2.3.1_p20191013-paths.patch | 40 |
2 files changed, 77 insertions, 0 deletions
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 new file mode 100644 index 000000000..932da9954 --- /dev/null +++ b/sci-biology/ants/files/ants-2.3.1_p20191013-logic.patch @@ -0,0 +1,37 @@ +From b2c828ff8e5ce537d7096af04b086e965fede9e8 Mon Sep 17 00:00:00 2001 +From: "Gabriel A. Devenyi" <gdevenyi@gmail.com> +Date: Mon, 7 Oct 2019 22:01:51 -0400 +Subject: [PATCH] Fix install logic + +--- + ANTS.cmake | 3 ++- + SuperBuild.cmake | 2 ++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/ANTS.cmake b/ANTS.cmake +index a1baf845..95ffdc74 100644 +--- a/ANTS.cmake ++++ b/ANTS.cmake +@@ -172,7 +172,8 @@ install(PROGRAMS Scripts/ANTSpexec.sh + COMPONENT SCRIPTS + ) + +-if(BUILD_SHARED_LIBS AND NOT (USE_SYSTEM_ITK AND USE_SYSTEM_VTK)) ++#Only install ITK/VTK libraries if shared build and superbuild is used ++if(BUILD_SHARED_LIBS AND ((NOT USE_SYSTEM_ITK) OR ((NOT USE_SYSTEM_VTK) AND USE_VTK))) + install(DIRECTORY ${CMAKE_BINARY_DIR}/../staging/lib/ + DESTINATION lib) + endif() +diff --git a/SuperBuild.cmake b/SuperBuild.cmake +index f4630e64..32b930c2 100644 +--- a/SuperBuild.cmake ++++ b/SuperBuild.cmake +@@ -207,6 +207,8 @@ list(APPEND ${CMAKE_PROJECT_NAME}_SUPERBUILD_EP_VARS + CMAKE_C_COMPILER_LAUNCHER:STRING + CMAKE_CXX_COMPILER_LAUNCHER:STRING + CMAKE_CUDA_COMPILER_LAUNCHER:STRING ++ USE_SYSTEM_ITK:BOOL ++ USE_SYSTEM_VTK:BOOL + ) + + _expand_external_project_vars() 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 new file mode 100644 index 000000000..aaea92808 --- /dev/null +++ b/sci-biology/ants/files/ants-2.3.1_p20191013-paths.patch @@ -0,0 +1,40 @@ +diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt +--- a/Examples/CMakeLists.txt ++++ b/Examples/CMakeLists.txt +@@ -16,8 +16,9 @@ ++include(GNUInstallDirs) + install(TARGETS antsUtilities +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT RUNTIME_antsUtilities +- LIBRARY DESTINATION lib ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT RUNTIME_antsUtilities +- ARCHIVE DESTINATION lib ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT DEVELOPMENT_antsUtilities + ) +@@ -38,8 +38,8 @@ + install(TARGETS l_${ANTS_FUNCTION_NAME} ${ANTS_FUNCTION_NAME} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT RUNTIME_${ANTS_FUNCTION_NAME} +- LIBRARY DESTINATION lib ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT RUNTIME_${ANTS_FUNCTION_NAME} +- ARCHIVE DESTINATION lib ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT DEVELOPMENT_${ANTS_FUNCTION_NAME} + ) +@@ -61,8 +61,8 @@ + install(TARGETS l_${ANTS_FUNCTION_NAME} ${ANTS_FUNCTION_NAME} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT RUNTIME_${ANTS_FUNCTION_NAME} +- LIBRARY DESTINATION lib ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT RUNTIME_${ANTS_FUNCTION_NAME} +- ARCHIVE DESTINATION lib ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT DEVELOPMENT_${ANTS_FUNCTION_NAME} + ) |