X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=Testing%2FCMakeLists.txt;h=4b16fcb0eaf6efc7621f01d5f3579c0f2c6a5615;hb=0b9694d267e7eab6b1b8fb25d59fde201ccb1000;hp=c72582f756ead3ef1f64488c3419d198149f81e2;hpb=664f8e416ecf1edcf4c29cf27be36e21810fa278;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index c72582f7..4b16fcb0 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -15,12 +15,19 @@ SET(TEST_SOURCES
   TestVR.cxx
   TestDictGroupName.cxx
   TestDict.cxx
+  TestDataEntry.cxx
   TestWriteSimple.cxx
   TestImageSet.cxx
   TestDicomDirElement.cxx
   TestDicomString.cxx
-  #TestValidate.cxx
+  TestEnumVR.cxx
+
 )
+IF(UNIX)
+  SET(TEST_SOURCES ${TEST_SOURCES}
+    TestInline.cxx
+  )
+ENDIF(UNIX)
 
 # add tests that require data
 IF (GDCM_DATA_ROOT)
@@ -41,6 +48,8 @@ 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
+    TestValidate.cxx                 #Just to have on overviews of oddities ...  
   )
   # add test that require VTK:
   IF(GDCM_VTK)
@@ -59,7 +68,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,8 +84,8 @@ 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})
@@ -143,6 +152,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