Merge pull request #867 from gdevenyi/cmake_itK_vtk_logic

Fix install step for SYSTEM/ITK/VTK, fix corner case in cmake config.
ANTsX · Oct 14, 2019 · 57cc85f · 57cc85f
2 parents f78b2d4 + b2c828f
commit 57cc85f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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()