Procházet zdrojové kódy

Automatically reformat list passed to "CTK" inner build.

See #418
Jean-Christophe Fillion-Robin před 11 roky
rodič
revize
25e0de7cb4
2 změnil soubory, kde provedl 6 přidání a 1 odebrání
  1. 1 0
      CMakeLists.txt
  2. 5 1
      SuperBuild.cmake

+ 1 - 0
CMakeLists.txt

@@ -163,6 +163,7 @@ set(CTK_CMAKE_UTILITIES_DIR ${CTK_SOURCE_DIR}/Utilities/CMake)
 # CMake function(s) and macro(s)
 #
 foreach(file
+  CMake/ctkListToString.cmake
   CMake/ctkMacroParseArguments.cmake
   CMake/ctkMacroSetPaths.cmake
   CMake/ctkMacroListFilter.cmake

+ 5 - 1
SuperBuild.cmake

@@ -114,7 +114,10 @@ foreach(arg ${CTK_SUPERBUILD_EP_VARS})
   set(target_info_list ${target_info_list})
   list(GET varname_and_vartype 0 _varname)
   list(GET varname_and_vartype 1 _vartype)
-  list(APPEND CTK_SUPERBUILD_EP_ARGS -D${_varname}:${_vartype}=${${_varname}})
+  # Separate list item with <sep>
+  set(ep_arg_as_string "")
+  ctk_list_to_string(${sep} "${${_varname}}" ep_arg_as_string)
+  list(APPEND CTK_SUPERBUILD_EP_ARGS -D${_varname}:${_vartype}=${ep_arg_as_string})
   list(APPEND CTK_SUPERBUILD_EP_VARNAMES ${_varname})
 endforeach()
 string(REPLACE ";" "^" CTK_SUPERBUILD_EP_VARNAMES "${CTK_SUPERBUILD_EP_VARNAMES}")
@@ -140,6 +143,7 @@ set(proj CTK-Configure)
 ExternalProject_Add(${proj}
   DOWNLOAD_COMMAND ""
   CMAKE_GENERATOR ${gen}
+  LIST_SEPARATOR ${sep}
   CMAKE_ARGS
     -DCTK_SUPERBUILD:BOOL=OFF
     -DCTK_SUPERBUILD_BINARY_DIR:PATH=${CTK_BINARY_DIR}