X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FCMakeLists.txt;h=02295475d4af09fc6aa1f6733a00b4437fb90620;hb=854db8dc59b48ed60021889c8a57c187bb817cc6;hp=c72582f756ead3ef1f64488c3419d198149f81e2;hpb=664f8e416ecf1edcf4c29cf27be36e21810fa278;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index c72582f7..02295475 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
@@ -59,7 +60,7 @@ IF (GDCM_DATA_ROOT)
       INCLUDE(${VTK_USE_FILE})
 
       INCLUDE_DIRECTORIES(
-        ${GDCM_SOURCE_DIR}/vtk/
+        ${GDCM_SOURCE_DIR}/vtk
       )
       SET(TEST_SOURCES ${TEST_SOURCES}
         VTKTestRead.cxx
@@ -75,14 +76,16 @@ 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)
-  TARGET_LINK_LIBRARIES(gdcmTests vtkgdcm vtkRendering)
+  IF(GDCM_DATA_ROOT)
+    TARGET_LINK_LIBRARIES(gdcmTests vtkgdcm vtkRendering)
+  ENDIF(GDCM_DATA_ROOT)
 ELSE(GDCM_VTK)
   TARGET_LINK_LIBRARIES(gdcmTests gdcm)
 ENDIF(GDCM_VTK)
@@ -143,6 +146,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