Skip to content

Commit 3adfbb6

Browse files
committed
init: use 'EVAL CODE' in cmake init script
Apply same kind of code in init script than used on autoinit. Signed-off-by: Xavier Delaruelle <xavier.delaruelle@cea.fr>
1 parent 4beb109 commit 3adfbb6

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

init/cmake.in

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ if(DEFINED ENV{MODULES_RUN_QUARANTINE})
1010
foreach(_mlv ${_mlv_list})
1111
if(${_mlv} MATCHES "^[A-Za-z_][A-Za-z0-9_]*$")
1212
if(DEFINED ENV{${_mlv}})
13-
set(_mlre "${_mlre}__MODULES_QUAR_${_mlv}=$ENV{${_mlv}};")
13+
string(APPEND _mlre
14+
" [===[__MODULES_QUAR_${_mlv}=$ENV{${_mlv}}]===]")
1415
endif()
1516
set(_mlrv "MODULES_RUNENV_${_mlv}")
16-
set(_mlre "${_mlre}${_mlv}=$ENV{${_mlrv}};")
17+
string(APPEND _mlre " [===[${_mlv}=$ENV{${_mlrv}}]===]")
1718
endif()
1819
endforeach()
1920
if (NOT "${_mlre}" STREQUAL "")
20-
set(_mlre "env;${_mlre}__MODULES_QUARANTINE_SET=1;")
21+
set(_mlre "env ${_mlre} __MODULES_QUARANTINE_SET=1")
2122
endif()
2223
endif()
2324

@@ -26,8 +27,9 @@ endif()
2627
execute_process(COMMAND mktemp -t moduleinit.cmake.XXXXXXXXXXXX
2728
OUTPUT_VARIABLE tempfile_name
2829
OUTPUT_STRIP_TRAILING_WHITESPACE)
29-
execute_process(COMMAND ${_mlre} @TCLSH@ "@libexecdir@/modulecmd.tcl" cmake autoinit
30-
OUTPUT_FILE ${tempfile_name})
30+
set(quotedArgs "COMMAND ${_mlre} @TCLSH@ \"@libexecdir@/modulecmd.tcl\" cmake")
31+
string(APPEND quotedArgs " autoinit OUTPUT_FILE ${tempfile_name}")
32+
cmake_language(EVAL CODE "execute_process(${quotedArgs})")
3133
if(EXISTS ${tempfile_name})
3234
include(${tempfile_name})
3335
file(REMOVE ${tempfile_name})

0 commit comments

Comments
 (0)