Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid creating nmake inference rule problems #383

Merged
merged 1 commit into from
Mar 13, 2013
Merged

Avoid creating nmake inference rule problems #383

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cmake/test/tests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ function(catkin_run_tests_target type name xunit_filename)
if(NOT TARGET run_tests_${PROJECT_NAME})
add_custom_target(run_tests_${PROJECT_NAME})
# create hidden meta target which depends on hidden test targets which depend on clean_test_results
add_custom_target(.run_tests_${PROJECT_NAME})
add_custom_target(_run_tests_${PROJECT_NAME})
# run_tests depends on this hidden target hierarchy to clear test results before running all tests
add_dependencies(run_tests .run_tests_${PROJECT_NAME})
add_dependencies(run_tests _run_tests_${PROJECT_NAME})
endif()
# create meta target to trigger all tests of a specific type of a project
if(NOT TARGET run_tests_${PROJECT_NAME}_${type})
add_custom_target(run_tests_${PROJECT_NAME}_${type})
add_dependencies(run_tests_${PROJECT_NAME} run_tests_${PROJECT_NAME}_${type})
# hidden meta target which depends on hidden test targets which depend on clean_test_results
add_custom_target(.run_tests_${PROJECT_NAME}_${type})
add_dependencies(.run_tests_${PROJECT_NAME} .run_tests_${PROJECT_NAME}_${type})
add_custom_target(_run_tests_${PROJECT_NAME}_${type})
add_dependencies(_run_tests_${PROJECT_NAME} _run_tests_${PROJECT_NAME}_${type})
endif()
# create target for test execution
set(results ${CATKIN_TEST_RESULTS_DIR}/${PROJECT_NAME}/${xunit_filename})
Expand All @@ -70,8 +70,8 @@ function(catkin_run_tests_target type name xunit_filename)
add_dependencies(run_tests_${PROJECT_NAME}_${type}_${name} ${_testing_DEPENDENCIES})
endif()
# hidden test target which depends on building all tests and cleaning test results
add_custom_target(.run_tests_${PROJECT_NAME}_${type}_${name}
add_custom_target(_run_tests_${PROJECT_NAME}_${type}_${name}
COMMAND ${cmd})
add_dependencies(.run_tests_${PROJECT_NAME}_${type} .run_tests_${PROJECT_NAME}_${type}_${name})
add_dependencies(.run_tests_${PROJECT_NAME}_${type}_${name} clean_test_results tests ${_testing_DEPENDENCIES})
add_dependencies(_run_tests_${PROJECT_NAME}_${type} _run_tests_${PROJECT_NAME}_${type}_${name})
add_dependencies(_run_tests_${PROJECT_NAME}_${type}_${name} clean_test_results tests ${_testing_DEPENDENCIES})
endfunction()