From 727cd4b6811126fe8877488e5fe8164f66c45ddf Mon Sep 17 00:00:00 2001 From: malaterre Date: Tue, 18 Sep 2007 07:59:37 +0000 Subject: [PATCH] ENH: do not run valgrind on dcmdump/reWrite test --- CMake/CTestCustom.ctest.in | 6 ++++++ CMakeLists.txt | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMake/CTestCustom.ctest.in b/CMake/CTestCustom.ctest.in index 3c8bb614..6ec7c79d 100644 --- a/CMake/CTestCustom.ctest.in +++ b/CMake/CTestCustom.ctest.in @@ -13,3 +13,9 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION ) +SET(CTEST_CUSTOM_MEMCHECK_IGNORE + ${CTEST_CUSTOM_MEMCHECK_IGNORE} + dcmdump + ReWrite + dcmdump-x-rgb-MR_Philips_Intera_SwitchIndianess_noLgtSQItem_in_trueLgtSeq.dcm + ) diff --git a/CMakeLists.txt b/CMakeLists.txt index d988ba74..6224b805 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,6 +155,10 @@ FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr $ENV{GDCM_DATA} $ENV{PUB_DICT_PATH}/../../gdcmData ) +# Adding GDCM_DATA_ROOT +FIND_PATH(GDCM_DATA_EXTRA_ROOT gdcmData.tar.gz + ${GDCM_SOURCE_DIR}/../gdcmDataExtra +) # Set the place for the public dictionary, must be set before gdcmConfigure.h FIND_PATH(GDCM_PUB_DICT_PATH dicomV3.dic @@ -257,7 +261,7 @@ OPTION(BUILD_TESTING "Build testing." ON) IF(BUILD_TESTING) CONFIGURE_FILE(${GDCM_SOURCE_DIR}/CMake/CTestCustom.ctest.in - ${GDCM_BINARY_DIR}/CMake/CTestCustom.ctest @ONLY) + ${GDCM_BINARY_DIR}/CTestCustom.ctest @ONLY) ENABLE_TESTING() INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) MARK_AS_ADVANCED(DART_ROOT) -- 2.45.1