Skip to content

Commit e67412d

Browse files
kinkednadlinger
authored andcommitted
cmake: Fix LDC command line quoting on Windows
1 parent e1421b1 commit e67412d

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

CMakeLists.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,14 +581,21 @@ function(build_d_executable output_exe compiler_args linker_args dependencies)
581581
DEPENDS ${object_file}
582582
)
583583
else()
584+
set(dflags "${D_COMPILER_FLAGS} ${DDMD_DFLAGS} ${DDMD_LFLAGS}")
584585
set(lflags ${LDC_TRANSLATED_LINKER_FLAGS})
585-
separate_arguments(lflags)
586+
if(UNIX)
587+
separate_arguments(dflags UNIX_COMMAND "${dflags}")
588+
separate_arguments(lflags UNIX_COMMAND "${lflags}")
589+
else()
590+
separate_arguments(dflags WINDOWS_COMMAND "${dflags}")
591+
separate_arguments(lflags WINDOWS_COMMAND "${lflags}")
592+
endif()
586593
foreach(f ${linker_args})
587594
append("-L\"${f}\"" lflags)
588595
endforeach()
589596
add_custom_command(
590597
OUTPUT ${output_exe}
591-
COMMAND ${D_COMPILER} ${D_COMPILER_FLAGS} ${DDMD_DFLAGS} ${DDMD_LFLAGS} ${lflags} -I${PROJECT_SOURCE_DIR}/${DDMDFE_PATH} -of${output_exe} ${compiler_args} ${linker_args}
598+
COMMAND ${D_COMPILER} ${dflags} ${lflags} -I${PROJECT_SOURCE_DIR}/${DDMDFE_PATH} -of${output_exe} ${compiler_args} ${linker_args}
592599
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
593600
DEPENDS ${dependencies}
594601
)

0 commit comments

Comments
 (0)