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

look in current source dir instead of top source dir for roslaunch files / directories, #2796

This commit is contained in:
Brian Gerkey 2010-06-14 23:49:23 +00:00
parent 107f65852c
commit e0abe9c1bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/rosbuild/private.cmake
View File

@ -259,7 +259,7 @@ endmacro(_rosbuild_add_pyunit)
macro(_rosbuild_add_roslaunch_check file)
# Check that the file exists, #1621
set(_file_name _file_name-NOTFOUND)
find_file(_file_name ${file} ${PROJECT_SOURCE_DIR} /)
find_file(_file_name ${file} ${CMAKE_CURRENT_SOURCE_DIR} /)
if(NOT _file_name)
message(FATAL_ERROR "Can't find roslaunch file or directory \"${file}\"")
endif(NOT _file_name)
@ -274,7 +274,7 @@ macro(_rosbuild_add_roslaunch_check file)
add_custom_target(roslaunch_check_${_testname}
COMMAND ${rostest_path}/bin/roslaunch-check.py ${file} ${ARGN}
DEPENDS ${file}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
VERBATIM)
# Make sure all test programs are built before running this test