michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: qemu: Restore QEMU_INSTANCE option handling.

Browse source 
QEMU_INSTANCE should be a parameter to *make*, not cmake, so people
can run few instances of the same sample without building each of
them separately in separate dirs.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
This commit is contained in:
Paul Sokolovsky 2017-11-23 19:56:04 +02:00 • committed by Anas Nashif
commit 5539047d93
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cmake/qemu/CMakeLists.txt
View file

@ -1,10 +1,6 @@
if(EMU_PLATFORM) if(EMU_PLATFORM)
# TODO: Support more emulators # TODO: Support more emulators
# QEMU_INSTANCE is a command line argument to make. By appending the
# instance name to the pid file we can easily run more instances of
# the same sample.
set(qemu_targets set(qemu_targets
run run
debugserver debugserver
@ -57,8 +53,11 @@ if(EMU_PLATFORM)
-pidfile qemu-${target}.pid -pidfile qemu-${target}.pid
) )
else() else()
# QEMU_INSTANCE is a command line argument to *make* (not cmake). By
# appending the instance name to the pid file we can easily run more
# instances of the same sample.
list(APPEND MORE_FLAGS_FOR_${target} list(APPEND MORE_FLAGS_FOR_${target}
-serial unix:/tmp/slip.sock${QEMU_INSTANCE} -serial unix:/tmp/slip.sock\${QEMU_INSTANCE}
) )
endif() endif()
endforeach() endforeach()
@ -150,7 +149,7 @@ if(EMU_PLATFORM)
COMMAND COMMAND
${QEMU} ${QEMU}
${QEMU_FLAGS_${ARCH}} ${QEMU_FLAGS_${ARCH}}
-pidfile qemu${QEMU_INSTANCE}.pid -pidfile qemu\${QEMU_INSTANCE}.pid
${QEMU_FLAGS} ${QEMU_FLAGS}
${QEMU_EXTRA_FLAGS} ${QEMU_EXTRA_FLAGS}
${MORE_FLAGS_FOR_${target}} ${MORE_FLAGS_FOR_${target}}