Skip to content
Snippets Groups Projects
Commit 282bd45b authored by Lars Bilke's avatar Lars Bilke Committed by Dmitri Naumov
Browse files

Don't search for vtkdiffs path, just you its target.

parent ad8beff3
No related branches found
No related tags found
No related merge requests found
...@@ -97,7 +97,7 @@ function (AddTest) ...@@ -97,7 +97,7 @@ function (AddTest)
if(AddTest_TESTER STREQUAL "numdiff" AND NOT NUMDIFF_TOOL_PATH) if(AddTest_TESTER STREQUAL "numdiff" AND NOT NUMDIFF_TOOL_PATH)
return() return()
endif() endif()
if(AddTest_TESTER STREQUAL "vtkdiff" AND NOT VTKDIFF_TOOL_PATH) if(AddTest_TESTER STREQUAL "vtkdiff" AND NOT TARGET vtkdiff)
return() return()
endif() endif()
if(AddTest_TESTER STREQUAL "memcheck" AND NOT GREP_TOOL_PATH) if(AddTest_TESTER STREQUAL "memcheck" AND NOT GREP_TOOL_PATH)
...@@ -115,7 +115,7 @@ function (AddTest) ...@@ -115,7 +115,7 @@ function (AddTest)
set(SELECTED_DIFF_TOOL_PATH ${NUMDIFF_TOOL_PATH}) set(SELECTED_DIFF_TOOL_PATH ${NUMDIFF_TOOL_PATH})
set(TESTER_ARGS "--statistics --absolute-tolerance=1e-5 --relative-tolerance=1e-4") set(TESTER_ARGS "--statistics --absolute-tolerance=1e-5 --relative-tolerance=1e-4")
elseif(AddTest_TESTER STREQUAL "vtkdiff") elseif(AddTest_TESTER STREQUAL "vtkdiff")
set(SELECTED_DIFF_TOOL_PATH ${VTKDIFF_TOOL_PATH}) set(SELECTED_DIFF_TOOL_PATH $<TARGET_FILE:vtkdiff>)
set(TESTER_ARGS "-q --abs 1e-5 --rel 1e-4") set(TESTER_ARGS "-q --abs 1e-5 --rel 1e-4")
endif() endif()
......
# Find tools and data # Find tools and data
find_program(DIFF_TOOL_PATH diff) find_program(DIFF_TOOL_PATH diff)
find_program(NUMDIFF_TOOL_PATH numdiff) find_program(NUMDIFF_TOOL_PATH numdiff)
find_program(VTKDIFF_TOOL_PATH vtkdiff ${CMAKE_BINARY_DIR}/bin)
# find_program(TIME_TOOL_PATH time) # TODO: does not work Travis # find_program(TIME_TOOL_PATH time) # TODO: does not work Travis
set(TIME_TOOL_PATH time) set(TIME_TOOL_PATH time)
find_program(GREP_TOOL_PATH grep) find_program(GREP_TOOL_PATH grep)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment