X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=Testing%2FCMakeLists.txt;h=a845c7479a1a91d52aeb15476f1025441dffcfc5;hb=27e8696556eff77e15a7a8fc2976ed31f882e0f1;hp=28986cb5f76fdd800a255b63b6cd630bdd45cd78;hpb=fb3bc19d96ec0bf38de3a466208a891a799f4797;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 28986cb5..a845c747 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -15,6 +15,7 @@ SET(TEST_SOURCES
   TestVR.cxx
   TestDictGroupName.cxx
   TestDict.cxx
+  TestDataEntry.cxx
   TestWriteSimple.cxx
   TestImageSet.cxx
   TestDicomDirElement.cxx
@@ -41,6 +42,7 @@ IF (GDCM_DATA_ROOT)
     TestBuildUpDicomDir.cxx          # writes a file named "NewDICOMDIR"
     TestMakeDicomDir.cxx             # writes a file named "NewDICOMDIR"
     TestSerieHelper.cxx              # uses gdcmData as a default root directory    
+    TestAllVM.cxx
   )
   # add test that require VTK:
   IF(GDCM_VTK)
@@ -75,16 +77,14 @@ ENDIF (GDCM_DATA_ROOT)
 
 # include stuff
 INCLUDE_DIRECTORIES(
-  ${GDCM_SOURCE_DIR}/src/
-  ${GDCM_BINARY_DIR}/
+  ${GDCM_SOURCE_DIR}/src
+  ${GDCM_BINARY_DIR}
 )
 
 CREATE_TEST_SOURCELIST(Tests gdcmTests.cxx ${TEST_SOURCES})
 ADD_EXECUTABLE(gdcmTests ${Tests})
 IF(GDCM_VTK)
-  IF(GDCM_DATA_ROOT)
-    TARGET_LINK_LIBRARIES(gdcmTests vtkgdcm vtkRendering)
-  ENDIF(GDCM_DATA_ROOT)
+  TARGET_LINK_LIBRARIES(gdcmTests vtkgdcm vtkRendering)
 ELSE(GDCM_VTK)
   TARGET_LINK_LIBRARIES(gdcmTests gdcm)
 ENDIF(GDCM_VTK)
@@ -145,6 +145,9 @@ SET(BLACK_LIST
   "MR_Philips_Intera_No_PrivateSequenceImplicitVR.dcm"
   "MR_Philips_Intera_PrivateSequenceImplicitVR.dcm"
   "MR_SIEMENS_forceLoad29-1010_29-1020.dcm"
+  # An element contains a value of 4, but no data follows
+  # So, the next (group, elem) is not correctly read
+  "gdcm-MR-PHILIPS-16-Multi-Seq.dcm"
   )
 
 # Create a specific list of dicom files that we know are part of a sequence