Add 'rules' to install from superbuild

CMake/ctkBlockCheckDependencies.cmake

@@ -44,7 +44,7 @@ if(CTK_SUPERBUILD)
       -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
       -DCMAKE_C_FLAGS:STRING=${ep_common_c_flags}
       -DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}
-      -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir}
+      -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
       -DCMAKE_PREFIX_PATH:STRING=${CMAKE_PREFIX_PATH}
       -DBUILD_TESTING:BOOL=OFF
      )

CMake/ctkMacroCheckExternalProjectDependency.cmake

@@ -682,3 +682,21 @@ macro(ExternalProject_Add_Empty project_name)
     DEPENDS ${_sb_DEPENDS}
     )
 endmacro()
+
+#.rst:
+# .. cmake:function:: ExternalProject_Install_CMake
+#
+# Install an external CMake-based project as part of the ``install`` target.
+#
+# .. code-block:: cmake
+#
+#  ExternalProject_Install_CMake(<project_name>)
+#
+# This causes building the main project's ``install`` target to also execute
+# the CMake install script for the specified external project.
+#
+function(ExternalProject_Install_CMake project_name)
+  ExternalProject_Get_Property(${project_name} binary_dir)
+
+  install(SCRIPT ${binary_dir}/cmake_install.cmake)
+endfunction()

CMakeExternals/DCMTK.cmake

@@ -53,13 +53,14 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     PREFIX ${proj}${ep_suffix}
     ${location_args}
     UPDATE_COMMAND ""
-    BUILD_COMMAND ""
+    # INSTALL_COMMAND "" TODO
     CMAKE_ARGS
       -DDCMTK_INSTALL_BINDIR:STRING=bin/${CMAKE_CFG_INTDIR}
       -DDCMTK_INSTALL_LIBDIR:STRING=lib/${CMAKE_CFG_INTDIR}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       ${ep_project_include_arg}
+      -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir} # TODO use from build directory
       -DBUILD_SHARED_LIBS:BOOL=ON
       -DDCMTK_WITH_DOXYGEN:BOOL=OFF
       -DDCMTK_WITH_ZLIB:BOOL=OFF # see github issue #25
@@ -75,6 +76,8 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     )
   set(DCMTK_DIR ${ep_install_dir})
 
+  # ExternalProject_Install_CMake(${proj}) TODO
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()

CMakeExternals/ITK.cmake

@@ -72,6 +72,8 @@ if(NOT DEFINED ITK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     )
   set(ITK_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
+  ExternalProject_Install_CMake(${proj})
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()

CMakeExternals/KWStyle.cmake

@@ -44,6 +44,7 @@ if(NOT DEFINED KWSTYLE_EXECUTABLE)
     ${location_args}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
+      -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir}
     DEPENDS
       ${${proj}_DEPENDENCIES}
     )

CMakeExternals/Log4Qt.cmake

@@ -56,6 +56,8 @@ if(NOT DEFINED Log4Qt_DIR)
     )
   set(Log4Qt_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
+  ExternalProject_Install_CMake(${proj})
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()

CMakeExternals/OpenIGTLink.cmake

@@ -53,6 +53,8 @@ if(NOT DEFINED OpenIGTLink_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     )
   set(OpenIGTLink_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
+  ExternalProject_Install_CMake(${proj})
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()

CMakeExternals/PythonQt.cmake

@@ -86,25 +86,31 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
     PREFIX ${proj}${ep_suffix}
     ${location_args}
     UPDATE_COMMAND ""
-    BUILD_COMMAND ""
+    # INSTALL_COMMAND "" TODO use from build directory
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
+      -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir} # TODO use from build directory
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
       -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}
       -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
+      # -DPythonQt_INSTALL_RUNTIME_DIR:STRING=${CTK_INSTALL_BIN_DIR} TODO
+      # -DPythonQt_INSTALL_LIBRARY_DIR:STRING=${CTK_INSTALL_LIB_DIR} TODO
+      # -DPythonQt_INSTALL_ARCHIVE_DIR:STRING=${CTK_INSTALL_LIB_DIR} TODO
       ${ep_PythonQt_args}
     DEPENDS
       ${${proj}_DEPENDENCIES}
     )
-  set(PYTHONQT_INSTALL_DIR ${ep_install_dir})
+  set(PYTHONQT_INSTALL_DIR ${ep_install_dir}) # TODO remove when not installed during build
+
+  # ExternalProject_Install_CMake(${proj}) TODO
 
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()
 
 mark_as_superbuild(
   VARS
-    PYTHONQT_INSTALL_DIR:PATH
+    PYTHONQT_INSTALL_DIR:PATH # TODO remove when not installed during build
     PYTHON_EXECUTABLE:FILEPATH # FindPythonInterp expects PYTHON_EXECUTABLE variable to be defined
     PYTHON_INCLUDE_DIR:PATH # FindPythonQt expects PYTHON_INCLUDE_DIR variable to be defined
     PYTHON_LIBRARY:FILEPATH # FindPythonQt expects PYTHON_LIBRARY variable to be defined

CMakeExternals/QtSOAP.cmake

@@ -58,6 +58,8 @@ if(NOT DEFINED QtSOAP_DIR)
     )
   set(QtSOAP_DIR "${CMAKE_BINARY_DIR}/${proj}-build")
 
+  ExternalProject_Install_CMake(${proj})
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()

CMakeExternals/QtTesting.cmake

@@ -57,23 +57,28 @@ if(NOT DEFINED QtTesting_DIR)
     PREFIX ${proj}${ep_suffix}
     ${location_args}
     UPDATE_COMMAND ""
+    # INSTALL_COMMAND "" TODO use from build directory
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
+      -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir} # TODO use from build directory
       -DBUILD_SHARED_LIBS:BOOL=ON
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+      # -DQtTesting_INSTALL_LIB_DIR:STRING=${CTK_INSTALL_LIB_DIR} TODO
     DEPENDS
       ${${proj}_DEPENDENCIES}
     )
-  set(QtTesting_INSTALL_DIR ${ep_install_dir})
+  set(QtTesting_INSTALL_DIR ${ep_install_dir}) # TODO remove when not installed during build
   set(QtTesting_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
+  # ExternalProject_Install_CMake(${proj}) TODO
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()
 
 mark_as_superbuild(
   VARS
-    QtTesting_INSTALL_DIR:PATH
+    QtTesting_INSTALL_DIR:PATH # TODO remove when not installed during build
     QtTesting_DIR:PATH
   LABELS "FIND_PACKAGE"
   )

CMakeExternals/VTK.cmake

@@ -81,6 +81,8 @@ if(NOT DEFINED VTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     )
   set(VTK_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
+  ExternalProject_Install_CMake(${proj})
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()

CMakeExternals/XIP.cmake

@@ -49,6 +49,8 @@ if(NOT DEFINED XIP_DIR)
     )
   set(XIP_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
+  ExternalProject_Install_CMake(${proj})
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()

CMakeExternals/ZMQ.cmake

@@ -58,6 +58,8 @@ if(NOT DEFINED ZMQ_DIR)
     )
   set(ZMQ_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
+  ExternalProject_Install_CMake(${proj})
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()

CMakeExternals/qRestAPI.cmake

@@ -57,6 +57,8 @@ if(NOT DEFINED ${proj}_DIR)
     )
   set(qRestAPI_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
 
+  ExternalProject_Install_CMake(${proj})
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()

CMakeExternals/qxmlrpc.cmake

@@ -57,6 +57,8 @@ if(NOT DEFINED qxmlrpc_DIR)
     )
   set(qxmlrpc_DIR "${CMAKE_BINARY_DIR}/${proj}-build")
 
+  ExternalProject_Install_CMake(${proj})
+
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()

SuperBuild.cmake

@@ -62,3 +62,5 @@ ExternalProject_Add_Step(${proj} forcebuild
   DEPENDEES build
   ALWAYS 1
   )
+
+ExternalProject_Install_CMake(${proj})