From 45b59f7d426280daf740dbcd0f337637b8992d43 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 8 Apr 2014 09:48:25 +0200
Subject: [PATCH] Time is just a shell function and FIND_PROGRAM has no
REQUIRED arg.
---
scripts/cmake/test/AddTest.cmake | 2 +-
scripts/cmake/test/Test.cmake | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index f0f1e82a48f..63abac3081b 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -4,7 +4,7 @@ FUNCTION (AddTest executable case_path case_name wrapper)
# Implement wrappers
IF(wrapper STREQUAL "TIME")
- SET(WRAPPER_COMMAND ${TIME_TOOL_PATH})
+ SET(WRAPPER_COMMAND time)
ELSEIF(wrapper STREQUAL "MEMCHECK" AND VALGRIND_TOOL_PATH)
SET(WRAPPER_COMMAND "${VALGRIND_TOOL_PATH} --tool=memcheck --log-file=${case_path}/${case_name}_memcheck.log -v --leak-check=full --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xff")
SET(tester MEMCHECK)
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index 132d9843d8b..1f011473dbf 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -1,10 +1,9 @@
# Find tools and data
-FIND_PROGRAM(TIME_TOOL_PATH time REQUIRED)
-FIND_PROGRAM(DIFF_TOOL_PATH diff REQUIRED)
-FIND_PROGRAM(GREP_TOOL_PATH grep REQUIRED)
-FIND_PROGRAM(BASH_TOOL_PATH bash REQUIRED)
-FIND_PROGRAM(VALGRIND_TOOL_PATH valgrind REQUIRED)
-FIND_FILE(OGS-DATA_PATH ".ogs6-data.dummy" REQUIRED
+FIND_PROGRAM(DIFF_TOOL_PATH diff)
+FIND_PROGRAM(GREP_TOOL_PATH grep)
+FIND_PROGRAM(BASH_TOOL_PATH bash)
+FIND_PROGRAM(VALGRIND_TOOL_PATH valgrind)
+FIND_FILE(OGS-DATA_PATH ".ogs6-data.dummy"
HINTS ${CMAKE_SOURCE_DIR}/../ogs6-data)
GET_FILENAME_COMPONENT(OGS-DATA_PATH ${OGS-DATA_PATH} PATH)
--
GitLab