ENH: do not run valgrind on dcmdump/reWrite test

diff --git a/CMake/CTestCustom.ctest.in b/CMake/CTestCustom.ctest.in
index 3c8bb6140d54d9db6cef6ad750a19bf204f3f936..6ec7c79d623cf55d3bcf1a577f87aed64ecb5b9a 100644 (file)
--- 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 d988ba74e39e46cd9fc751e956e4422e4755ce93..6224b8057913a4a34ff798f7c67859e9d1251f57 100644 (file)
--- 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)