resolve #419: use cmake 'EVAL CODE' to forward arguments passed to 'module' cmake function

Signed-off-by: Benoit Dumas <[email protected]>

Author: benoitdudu

tcl/envmngt.tcl.in

@@ -1178,13 +1178,10 @@ end}
       }
       cmake {
          if {[getConf quarantine_support]} {
-            set pre_exec "\n      execute_process(COMMAND \${_mlre} $tclshbin\
-            \"$::argv0\" cmake "
+            set pre_exec "COMMAND \${_mlre} $tclshbin \\\"$::argv0\\\" cmake "
          } else {
-            set pre_exec "\n      execute_process(COMMAND $tclshbin\
-            \"$::argv0\" cmake "
+            set pre_exec "COMMAND $tclshbin \\\"$::argv0\\\" cmake "
          }
-         set post_exec "\n         OUTPUT_FILE \${tempfile_name})\n"
          set fdef {function(module)
    cmake_policy(SET CMP0007 NEW)}
          if {[getConf quarantine_support]} {
@@ -1211,23 +1208,17 @@ end}
    execute_process(COMMAND mktemp -t moduleinit.cmake.XXXXXXXXXXXX
       OUTPUT_VARIABLE tempfile_name
       OUTPUT_STRIP_TRAILING_WHITESPACE)
-   if(${ARGC} EQUAL 1)}
-            # adapt command definition depending on the number of args to be
-            # able to pass to some extend (<5 args) empty string element to
-            # modulecmd (no other way as empty element in ${ARGV} are skipped
-            append fdef "$pre_exec\"\${ARGV0}\"$post_exec"
-            append fdef {   elseif(${ARGC} EQUAL 2)}
-            append fdef "$pre_exec\"\${ARGV0}\" \"\${ARGV1}\"$post_exec"
-            append fdef {   elseif(${ARGC} EQUAL 3)}
-            append fdef "$pre_exec\"\${ARGV0}\" \"\${ARGV1}\"\
-               \"\${ARGV2}\"$post_exec"
-            append fdef {   elseif(${ARGC} EQUAL 4)}
-            append fdef "$pre_exec\"\${ARGV0}\" \"\${ARGV1}\"\
-               \"\${ARGV2}\" \"\${ARGV3}\"$post_exec"
-            append fdef {   else()}
-            append fdef "$pre_exec\${ARGV}$post_exec"
-            append fdef {   endif()
-   if(EXISTS ${tempfile_name})
+}
+   append fdef "   set(quotedArgs \"$pre_exec\")"
+   append fdef {
+   cmake_parse_arguments(PARSE_ARGV 0 FWD "" "" "")
+   foreach(arg IN LISTS FWD_UNPARSED_ARGUMENTS)
+      string(APPEND quotedArgs " [===[${arg}]===]")
+   endforeach()
+   string(APPEND quotedArgs " OUTPUT_FILE ${tempfile_name}")
+   cmake_language(EVAL CODE "execute_process(${quotedArgs})")
+}
+   append fdef {   if(EXISTS ${tempfile_name})
       include(${tempfile_name})
       file(REMOVE ${tempfile_name})
    endif()

testsuite/modules.70-maint/120-autoinit.exp

@@ -427,22 +427,13 @@ set func_cmake "function\\\(module\\\)
 \\s*execute_process\\\(COMMAND mktemp -t moduleinit.cmake.XXXXXXXXXXXX
 \\s*OUTPUT_VARIABLE tempfile_name
 \\s*OUTPUT_STRIP_TRAILING_WHITESPACE\\\)
-\\s*if\\\(\\\${ARGC} EQUAL 1\\\)
-\\s*execute_process\\\(COMMAND \\\${_mlre} $tclshlocre \"$modulecmd_pathre\" cmake \"\\\${ARGV0}\"
-\\s*OUTPUT_FILE \\\${tempfile_name}\\\)
-\\s*elseif\\\(\\\${ARGC} EQUAL 2\\\)
-\\s*execute_process\\\(COMMAND \\\${_mlre} $tclshlocre \"$modulecmd_pathre\" cmake \"\\\${ARGV0}\" \"\\\${ARGV1}\"
-\\s*OUTPUT_FILE \\\${tempfile_name}\\\)
-\\s*elseif\\\(\\\${ARGC} EQUAL 3\\\)
-\\s*execute_process\\\(COMMAND \\\${_mlre} $tclshlocre \"$modulecmd_pathre\" cmake \"\\\${ARGV0}\" \"\\\${ARGV1}\" \"\\\${ARGV2}\"
-\\s*OUTPUT_FILE \\\${tempfile_name}\\\)
-\\s*elseif\\\(\\\${ARGC} EQUAL 4\\\)
-\\s*execute_process\\\(COMMAND \\\${_mlre} $tclshlocre \"$modulecmd_pathre\" cmake \"\\\${ARGV0}\" \"\\\${ARGV1}\" \"\\\${ARGV2}\" \"\\\${ARGV3}\"
-\\s*OUTPUT_FILE \\\${tempfile_name}\\\)
-\\s*else\\\(\\\)
-\\s*execute_process\\\(COMMAND \\\${_mlre} $tclshlocre \"$modulecmd_pathre\" cmake \\\${ARGV}
-\\s*OUTPUT_FILE \\\${tempfile_name}\\\)
-\\s*endif\\\(\\\)
+\\s*set\\\(quotedArgs \"COMMAND2 \\\${_mlre} $tclshlocre \\\\\"$modulecmd_pathre\\\\\" cmake \"\\\)
+\\s*cmake_parse_arguments\\\(PARSE_ARGV 0 FWD \"\" \"\" \"\"\\\)
+\\s*foreach\\\(arg IN LISTS FWD_UNPARSED_ARGUMENTS\\\)
+\\s*string\\\(APPEND quotedArgs \" \\\[===\\\[\\\${arg}\\\]===\\\]\"\\\)
+\\s*endforeach\\\(\\\)
+\\s*string\\\(APPEND quotedArgs \" OUTPUT_FILE \\\${tempfile_name}\"\\\)
+\\s*cmake_language\\\(EVAL CODE \"execute_process\\\(\\\${quotedArgs}\\\)\"\\\)
 \\s*if\\\(EXISTS \\\${tempfile_name}\\\)
 \\s*include\\\(\\\${tempfile_name}\\\)
 \\s*file\\\(REMOVE \\\${tempfile_name}\\\)
@@ -619,22 +610,13 @@ set func_cmake "function\\\(module\\\)
 \\s*execute_process\\\(COMMAND mktemp -t moduleinit.cmake.XXXXXXXXXXXX
 \\s*OUTPUT_VARIABLE tempfile_name
 \\s*OUTPUT_STRIP_TRAILING_WHITESPACE\\\)
-\\s*if\\\(\\\${ARGC} EQUAL 1\\\)
-\\s*execute_process\\\(COMMAND $tclshlocre \"$modulecmd_pathre\" cmake \"\\\${ARGV0}\"
-\\s*OUTPUT_FILE \\\${tempfile_name}\\\)
-\\s*elseif\\\(\\\${ARGC} EQUAL 2\\\)
-\\s*execute_process\\\(COMMAND $tclshlocre \"$modulecmd_pathre\" cmake \"\\\${ARGV0}\" \"\\\${ARGV1}\"
-\\s*OUTPUT_FILE \\\${tempfile_name}\\\)
-\\s*elseif\\\(\\\${ARGC} EQUAL 3\\\)
-\\s*execute_process\\\(COMMAND $tclshlocre \"$modulecmd_pathre\" cmake \"\\\${ARGV0}\" \"\\\${ARGV1}\" \"\\\${ARGV2}\"
-\\s*OUTPUT_FILE \\\${tempfile_name}\\\)
-\\s*elseif\\\(\\\${ARGC} EQUAL 4\\\)
-\\s*execute_process\\\(COMMAND $tclshlocre \"$modulecmd_pathre\" cmake \"\\\${ARGV0}\" \"\\\${ARGV1}\" \"\\\${ARGV2}\" \"\\\${ARGV3}\"
-\\s*OUTPUT_FILE \\\${tempfile_name}\\\)
-\\s*else\\\(\\\)
-\\s*execute_process\\\(COMMAND $tclshlocre \"$modulecmd_pathre\" cmake \\\${ARGV}
-\\s*OUTPUT_FILE \\\${tempfile_name}\\\)
-\\s*endif\\\(\\\)
+\\s*set\\\(quotedArgs \"COMMAND $tclshlocre \\\\\"$modulecmd_pathre\\\\\" cmake \"\\\)
+\\s*cmake_parse_arguments\\\(PARSE_ARGV 0 FWD \"\" \"\" \"\"\\\)
+\\s*foreach\\\(arg IN LISTS FWD_UNPARSED_ARGUMENTS\\\)
+\\s*string\\\(APPEND quotedArgs \" \\\[===\\\[\\\${arg}\\\]===\\\]\"\\\)
+\\s*endforeach\\\(\\\)
+\\s*string\\\(APPEND quotedArgs \" OUTPUT_FILE \\\${tempfile_name}\"\\\)
+\\s*cmake_language\\\(EVAL CODE \"execute_process\\\(\\\${quotedArgs}\\\)\"\\\)
 \\s*if\\\(EXISTS \\\${tempfile_name}\\\)
 \\s*include\\\(\\\${tempfile_name}\\\)
 \\s*file\\\(REMOVE \\\${tempfile_name}\\\)