Automatically add LIST_SEPARATOR external project argument

CMake/ctkMacroCheckExternalProjectDependency.cmake

@@ -21,8 +21,9 @@
 include(CMakeParseArguments)
 include(ctkListToString)
 
-# Use this value where semi-colons are needed in ep_add args:
-set(sep "^^")
+if(NOT DEFINED EP_LIST_SEPARATOR)
+  set(EP_LIST_SEPARATOR "^^")
+endif()
 
 if(NOT EXISTS "${EXTERNAL_PROJECT_DIR}")
   set(EXTERNAL_PROJECT_DIR ${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/SuperBuild)
@@ -171,9 +172,9 @@ function(_sb_cmakevar_to_cmakearg cmake_varname_and_type cmake_arg_var cmake_arg
   endif()
 
   if(cmake_arg_type STREQUAL "CMAKE_CMD")
-    # Separate list item with <sep>
+    # Separate list item with <EP_LIST_SEPARATOR>
     set(ep_arg_as_string "")
-    ctk_list_to_string(${sep} "${_var_value}" _var_value)
+    ctk_list_to_string(${EP_LIST_SEPARATOR} "${_var_value}" _var_value)
   endif()
 
   set(${cmake_arg_var} -D${_varname}:${_vartype}=${_var_value} PARENT_SCOPE)
@@ -287,6 +288,8 @@ function(_sb_get_external_project_arguments proj varname)
     endforeach()
   endif()
 
+  list(APPEND _ep_arguments LIST_SEPARATOR ${EP_LIST_SEPARATOR})
+
   set(${varname} ${_ep_arguments} PARENT_SCOPE)
 endfunction()
 

CMakeExternals/CTKData.cmake

@@ -42,7 +42,6 @@ if(NOT DEFINED CTKData_DIR)
     SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
-    LIST_SEPARATOR ${sep}
     ${location_args}
     UPDATE_COMMAND ""
     CONFIGURE_COMMAND ""

CMakeExternals/DCMTK.cmake

@@ -52,7 +52,6 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     CMAKE_GENERATOR ${gen}
     UPDATE_COMMAND ""
     BUILD_COMMAND ""
-    LIST_SEPARATOR ${sep}
     CMAKE_ARGS
       -DDCMTK_INSTALL_BINDIR:STRING=bin/${CMAKE_CFG_INTDIR}
       -DDCMTK_INSTALL_LIBDIR:STRING=lib/${CMAKE_CFG_INTDIR}

CMakeExternals/ITK.cmake

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

CMakeExternals/KWStyle.cmake

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

CMakeExternals/Log4Qt.cmake

@@ -46,7 +46,6 @@ if(NOT DEFINED Log4Qt_DIR)
     CMAKE_GENERATOR ${gen}
     INSTALL_COMMAND ""
     UPDATE_COMMAND ""
-    LIST_SEPARATOR ${sep}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}

CMakeExternals/OpenIGTLink.cmake

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

CMakeExternals/PythonQt.cmake

@@ -74,7 +74,6 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
     CMAKE_GENERATOR ${gen}
     UPDATE_COMMAND ""
     BUILD_COMMAND ""
-    LIST_SEPARATOR ${sep}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}

CMakeExternals/PythonQtGenerator.cmake

@@ -38,7 +38,6 @@ if(NOT DEFINED PYTHONQTGENERATOR_EXECUTABLE)
     DOWNLOAD_COMMAND ""
     CMAKE_GENERATOR ${gen}
     INSTALL_COMMAND ""
-    LIST_SEPARATOR ${sep}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}

CMakeExternals/QtSOAP.cmake

@@ -46,7 +46,6 @@ if(NOT DEFINED QtSOAP_DIR)
     CMAKE_GENERATOR ${gen}
     UPDATE_COMMAND ""
     INSTALL_COMMAND ""
-    LIST_SEPARATOR ${sep}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:STRING=${CTK_CMAKE_RUNTIME_OUTPUT_DIRECTORY}

CMakeExternals/QtTesting.cmake

@@ -57,7 +57,6 @@ if(NOT DEFINED QtTesting_DIR)
     ${location_args}
     CMAKE_GENERATOR ${gen}
     UPDATE_COMMAND ""
-    LIST_SEPARATOR ${sep}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DBUILD_SHARED_LIBS:BOOL=ON

CMakeExternals/VTK.cmake

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

CMakeExternals/XIP.cmake

@@ -38,7 +38,6 @@ if(NOT DEFINED XIP_DIR)
     ${location_args}
     INSTALL_COMMAND ""
     CMAKE_GENERATOR ${gen}
-    LIST_SEPARATOR ${sep}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DHAS_VTK:BOOL=OFF

CMakeExternals/ZMQ.cmake

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

CMakeExternals/qxmlrpc.cmake

@@ -45,7 +45,6 @@ if(NOT DEFINED qxmlrpc_DIR)
     ${location_args}
     CMAKE_GENERATOR ${gen}
     INSTALL_COMMAND ""
-    LIST_SEPARATOR ${sep}
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}

SuperBuild.cmake

@@ -46,7 +46,6 @@ ExternalProject_Add(${proj}
   ${CTK_EXTERNAL_PROJECT_ARGS}
   DOWNLOAD_COMMAND ""
   CMAKE_GENERATOR ${gen}
-  LIST_SEPARATOR ${sep}
   CMAKE_CACHE_ARGS
     -DCTK_SUPERBUILD:BOOL=OFF
     -DCTK_SUPERBUILD_BINARY_DIR:PATH=${CTK_BINARY_DIR}