Automatically add CMAKE_GENERATOR external project argument

CMake/ctkBlockCheckDependencies.cmake

@@ -47,13 +47,6 @@ if(CTK_SUPERBUILD)
       -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir}
       -DBUILD_TESTING:BOOL=OFF
      )
-
-  # Compute -G arg for configuring external projects with the same CMake generator:
-  if(CMAKE_EXTRA_GENERATOR)
-    set(gen "${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}")
-  else()
-    set(gen "${CMAKE_GENERATOR}")
-  endif()
 endif()
 
 if(NOT DEFINED CTK_DEPENDENCIES)

CMake/ctkMacroCheckExternalProjectDependency.cmake

@@ -33,6 +33,13 @@ if(NOT DEFINED EXTERNAL_PROJECT_FILE_PREFIX)
   set(EXTERNAL_PROJECT_FILE_PREFIX "External_")
 endif()
 
+# Compute -G arg for configuring external projects with the same CMake generator:
+if(CMAKE_EXTRA_GENERATOR)
+  set(EP_CMAKE_GENERATOR "${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}")
+else()
+  set(EP_CMAKE_GENERATOR "${CMAKE_GENERATOR}")
+endif()
+
 #
 # superbuild_include_once()
 #
@@ -290,6 +297,8 @@ function(_sb_get_external_project_arguments proj varname)
 
   list(APPEND _ep_arguments LIST_SEPARATOR ${EP_LIST_SEPARATOR})
 
+  list(APPEND _ep_arguments CMAKE_GENERATOR ${EP_CMAKE_GENERATOR})
+
   set(${varname} ${_ep_arguments} PARENT_SCOPE)
 endfunction()
 

CMakeExternals/DCMTK.cmake

@@ -49,7 +49,6 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    CMAKE_GENERATOR ${gen}
     UPDATE_COMMAND ""
     BUILD_COMMAND ""
     CMAKE_ARGS

CMakeExternals/ITK.cmake

@@ -52,7 +52,6 @@ if(NOT DEFINED ITK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     ${location_args}
     UPDATE_COMMAND ""
     INSTALL_COMMAND ""
-    CMAKE_GENERATOR ${gen}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       ${ep_project_include_arg}

CMakeExternals/KWStyle.cmake

@@ -39,7 +39,6 @@ if(NOT DEFINED KWSTYLE_EXECUTABLE)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    CMAKE_GENERATOR ${gen}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
     DEPENDS

CMakeExternals/Log4Qt.cmake

@@ -43,7 +43,6 @@ if(NOT DEFINED Log4Qt_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    CMAKE_GENERATOR ${gen}
     INSTALL_COMMAND ""
     UPDATE_COMMAND ""
     CMAKE_CACHE_ARGS

CMakeExternals/OpenIGTLink.cmake

@@ -42,7 +42,6 @@ if(NOT DEFINED OpenIGTLink_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     PREFIX ${proj}${ep_suffix}
     ${location_args}
     INSTALL_COMMAND ""
-    CMAKE_GENERATOR ${gen}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       ${ep_project_include_arg}

CMakeExternals/PythonQt.cmake

@@ -71,7 +71,6 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    CMAKE_GENERATOR ${gen}
     UPDATE_COMMAND ""
     BUILD_COMMAND ""
     CMAKE_CACHE_ARGS

CMakeExternals/PythonQtGenerator.cmake

@@ -36,7 +36,6 @@ if(NOT DEFINED PYTHONQTGENERATOR_EXECUTABLE)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     DOWNLOAD_COMMAND ""
-    CMAKE_GENERATOR ${gen}
     INSTALL_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}

CMakeExternals/QtSOAP.cmake

@@ -43,7 +43,6 @@ if(NOT DEFINED QtSOAP_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    CMAKE_GENERATOR ${gen}
     UPDATE_COMMAND ""
     INSTALL_COMMAND ""
     CMAKE_CACHE_ARGS

CMakeExternals/QtTesting.cmake

@@ -55,7 +55,6 @@ if(NOT DEFINED QtTesting_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    CMAKE_GENERATOR ${gen}
     UPDATE_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}

CMakeExternals/VTK.cmake

@@ -59,7 +59,6 @@ if(NOT DEFINED VTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     ${location_args}
     UPDATE_COMMAND ""
     INSTALL_COMMAND ""
-    CMAKE_GENERATOR ${gen}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       ${additional_vtk_cmakevars}

CMakeExternals/XIP.cmake

@@ -37,7 +37,6 @@ if(NOT DEFINED XIP_DIR)
     PREFIX ${proj}${ep_suffix}
     ${location_args}
     INSTALL_COMMAND ""
-    CMAKE_GENERATOR ${gen}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DHAS_VTK:BOOL=OFF

CMakeExternals/ZMQ.cmake

@@ -45,7 +45,6 @@ if(NOT DEFINED ZMQ_DIR)
     ${location_args}
     UPDATE_COMMAND ""
     INSTALL_COMMAND ""
-    CMAKE_GENERATOR ${gen}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DBUILD_SHARED_LIBS:BOOL=ON

CMakeExternals/qxmlrpc.cmake

@@ -43,7 +43,6 @@ if(NOT DEFINED qxmlrpc_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    CMAKE_GENERATOR ${gen}
     INSTALL_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}

SuperBuild.cmake

@@ -45,7 +45,7 @@ set(proj CTK)
 ExternalProject_Add(${proj}
   ${CTK_EXTERNAL_PROJECT_ARGS}
   DOWNLOAD_COMMAND ""
-  CMAKE_GENERATOR ${gen}
+  CMAKE_GENERATOR ${EP_CMAKE_GENERATOR}
   CMAKE_CACHE_ARGS
     -DCTK_SUPERBUILD:BOOL=OFF
     -DCTK_SUPERBUILD_BINARY_DIR:PATH=${CTK_BINARY_DIR}