p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add python executable to ROSUNIT_EXE so it runs correctly on Windows (#200)

This commit is contained in:
James Xu 2019-01-28 15:11:50 -08:00 committed by Dirk Thomas
parent 40c44bcb5f
commit 651c997e60
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/rosunit/cmake/rosunit-extras.cmake.em
View File

@ -4,11 +4,11 @@ macro(rosunit_initialize_tests)
@[if DEVELSPACE]@ @[if DEVELSPACE]@
# binary and script in develspace # binary and script in develspace
set(ROSUNIT_SCRIPTS_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts") set(ROSUNIT_SCRIPTS_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
set(ROSUNIT_EXE "${ROSUNIT_SCRIPTS_DIR}/rosunit") set(ROSUNIT_EXE "${PYTHON_EXECUTABLE} ${ROSUNIT_SCRIPTS_DIR}/rosunit")
@[else]@ @[else]@
# binary and script in installspace # binary and script in installspace
set(ROSUNIT_SCRIPTS_DIR "${rosunit_DIR}/../scripts") set(ROSUNIT_SCRIPTS_DIR "${rosunit_DIR}/../scripts")
set(ROSUNIT_EXE "${rosunit_DIR}/../../../@(CATKIN_GLOBAL_BIN_DESTINATION)/rosunit") set(ROSUNIT_EXE "${PYTHON_EXECUTABLE} ${rosunit_DIR}/../../../@(CATKIN_GLOBAL_BIN_DESTINATION)/rosunit")
@[end if]@ @[end if]@
endmacro() endmacro()