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

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 28986cb5..c8b94ef4 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -11,16 +11,24 @@ SET(TEST_SOURCES
   TestUtil.cxx
   TestBug.cxx
   TestHash.cxx
+  TestCommand.cxx
   TestTS.cxx
   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 +49,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)
@@ -75,16 +85,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)
@@ -126,11 +134,11 @@ SET(BLACK_LIST
   "ETIAM_video_002.dcm"
   #Something stupid occured in the code for LibIDO images.
   #I Black list them for a while. JP
-  "gdcm-ACR-LibIDO.acr"
+  #"gdcm-ACR-LibIDO.acr"
   "LIBIDO-24-ACR_NEMA-Rectangle.dcm"
   #16 Bits per pixel images with LUT 16 Bits.
   #I wait to be 100% sure before releasing them. JP
-  "rle16sti.dcm"
+  #rle16sti.dcm"
   "rle16loo.dcm"   
   # Jasper cannot handle this image, only kakadu so far, unless you patch jasper
   # but then it breaks other images...
@@ -141,10 +149,14 @@ SET(BLACK_LIST
   # I probabely messed up smething with the .png, .tst of
   # the images I recently added to the Test Suite
   # I Black list them, until I find where is the pb.
-  "US-RGB-8-esopecho.dcm"
-  "MR_Philips_Intera_No_PrivateSequenceImplicitVR.dcm"
+  #"US-RGB-8-esopecho.dcm"
+  #"MR_Philips_Intera_No_PrivateSequenceImplicitVR.dcm"
+  #"MR_SIEMENS_forceLoad29-1010_29-1020.dcm"
+  
+  #Still cause troubles (see the .README.txt file for more details)
+  "MR_Philips_Intera_in_SQ_2001_e05f_item_wrong_lgt_use_NOSHADOWSEQ.dcm"
+  "MR_Philips_Intera_PrivateSequenceExplicitVR.dcm"
   "MR_Philips_Intera_PrivateSequenceImplicitVR.dcm"
-  "MR_SIEMENS_forceLoad29-1010_29-1020.dcm"
   )
 
 # Create a specific list of dicom files that we know are part of a sequence