Skip to content

Commit 8aa6a18

Browse files
committed
update shell launchers
1 parent 8aa9e76 commit 8aa6a18

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

cmake/impl/pre.cmake

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,17 @@ set(BUILD_MODULE_SEARCH_DIRS
165165
)
166166

167167
# launchers
168-
if(WIN32)
169-
set(SHELL_LAUNCHER "cmd /C")
170-
else()
171-
set(SHELL_LAUNCHER "sh -c")
172-
endif()
168+
string(CONFIGURE [=[
169+
@echo off
170+
set "CMAKE=@CMAKE_COMMAND@"
171+
set "PATH=@BUILD_MODULE_SEARCH_DIRS@;%PATH%"
172+
%*
173+
]=] SHELL)
173174

174-
set_property(GLOBAL PROPERTY RULE_LAUNCH_CUSTOM
175-
"${CMAKE_COMMAND} -E env --modify PATH=path_list_prepend:${BUILD_MODULE_SEARCH_DIRS} -- ${SHELL_LAUNCHER}"
176-
)
175+
set(SHELL_LOCATION "${CMAKE_BINARY_DIR}/shell.cmd")
176+
file(WRITE "${SHELL_LOCATION}" "${SHELL}")
177+
178+
set_property(GLOBAL PROPERTY RULE_LAUNCH_CUSTOM "${SHELL_LOCATION}")
177179

178180
# NASM
179181
find_program(CMAKE_ASM_NASM_COMPILER nasm HINTS ENV PATH ENV NASM_DIR NO_CACHE REQUIRED)

0 commit comments

Comments
 (0)