From 1852b7d6faacf2196349bcddbfb5a217867558dd Mon Sep 17 00:00:00 2001 From: degomme Date: Fri, 11 Mar 2016 15:20:11 +0100 Subject: [PATCH] build this file in the build folder and not in the middle of the sources ... We need to correct it anyway, as it is awfully incompatible with the new way of doing tests --- tools/cmake/Modules/FindValgrind.cmake | 2 +- tools/cmake/Tests.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cmake/Modules/FindValgrind.cmake b/tools/cmake/Modules/FindValgrind.cmake index bc33a8d041..6283f84777 100644 --- a/tools/cmake/Modules/FindValgrind.cmake +++ b/tools/cmake/Modules/FindValgrind.cmake @@ -24,7 +24,7 @@ if(VALGRIND_EXE) string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}") if(NEW_VALGRIND_VERSION) message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}") - execute_process(COMMAND "${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/tools/cmake/Tests.cmake > ${CMAKE_HOME_DIRECTORY}/tools/cmake/memcheck_tests.cmake") + execute_process(COMMAND ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/tools/cmake/Tests.cmake OUTPUT_FILE ${CMAKE_BINARY_DIR}/memcheck_tests.cmake) set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --trace-children-skip=/usr/bin/*,/bin/* --leak-check=full --show-reachable=yes --track-origins=no --read-var-info=no --num-callers=20 --suppressions=${CMAKE_HOME_DIRECTORY}/tools/simgrid.supp ${VALGRIND_EXTRA_COMMAND_OPTIONS} ") message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}") else() diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 238503e12a..4f776c8f24 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -175,5 +175,5 @@ ADD_TEST(testall ${CMAKE_BINARY_DIR}/testall) IF(enable_memcheck) INCLUDE(FindValgrind) - INCLUDE(${CMAKE_HOME_DIRECTORY}/tools/cmake/memcheck_tests.cmake) + INCLUDE(${CMAKE_BINARY_DIR}/memcheck_tests.cmake) ENDIF() -- 2.20.1