X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=e0fae4eb319e9847a42d3ab868450c4687d1d93d;hb=afce239e3e7c343cb843b1767fc3ff11c540a3bb;hp=87961d2037054abbc7e1618ac6e7fb1afc4c4d76;hpb=59aed07162fbebcdb78fa2f452caaa1bc48dad49;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 87961d20..e0fae4eb 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -92,7 +92,11 @@ INCLUDE_DIRECTORIES(
 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)
+  ELSE(GDCM_DATA_ROOT)
+    TARGET_LINK_LIBRARIES(gdcmTests gdcm)
+  ENDIF(GDCM_DATA_ROOT)     
 ELSE(GDCM_VTK)
   TARGET_LINK_LIBRARIES(gdcmTests gdcm)
 ENDIF(GDCM_VTK)
@@ -139,27 +143,28 @@ SET(BLACK_LIST
   #16 Bits per pixel images with LUT 16 Bits.
   #I wait to be 100% sure before releasing them. JP
   "rle16sti.dcm"
-  #"rle16loo.dcm"   
+  "rle16loo.dcm"   
   # Jasper cannot handle this image, only kakadu so far, unless you patch jasper
   # but then it breaks other images...
   "CT_Phillips_JPEG2K_Decompr_Problem.dcm"
   #
   # ------------
-  #
-  # I probabely messed up something 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"
-  #"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" 
   #The 2 previous images are identical !
+  #--> Replaced by more significant name
+  "MR_Philips_Intera_PrivateSequenceExplicitVR_in_SQ_2001_e05f_item_wrong_lgt_use_NOSHADOWSEQ.dcm"
+
   #hexedit shows something *very* strange around offset 0x76e !
   #the images looks *over*corrupted (on disc, not from the manufacturer!)
   "MR_Philips_Intera_PrivateSequenceImplicitVR.dcm"
+  
+  # Seems this one hangs on 64 bits processors ?!?
+  # I blacklist it untill the pb is solved.
+  # (to get some more green on the Dasboards)
+  "MR_Philips-Intera_BreaksNOSHADOW.dcm"
   )
 
 # Create a specific list of dicom files that we know are part of a sequence
@@ -212,4 +217,21 @@ IF(UNIX AND NOT BUILD_SHARED_LIBS)
 ENDIF(UNIX AND NOT BUILD_SHARED_LIBS)
 
 
+#-----------------------------------------------------------------------------
+# Do the build against an installed gdcm
+SET(GDCM_TEST_INSTALL_LEFT "${CMAKE_INSTALL_PREFIX}")
+SET(GDCM_TEST_INSTALL_RIGHT "${GDCM_BINARY_DIR}/InstallTest/Root")
+STRING(COMPARE EQUAL "${GDCM_TEST_INSTALL_LEFT}" "${GDCM_TEST_INSTALL_RIGHT}"
+  GDCM_TEST_INSTALL)
+IF(GDCM_TEST_INSTALL)
+  ADD_TEST(Install
+    ${CMAKE_CTEST_COMMAND}
+    #  ${GDCM_INSTALL_TEST_CONFIG_TYPE}
+    --build-and-test ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
+    --build-generator ${CMAKE_GENERATOR}
+    --build-project GDCM
+    --build-makeprogram ${CMAKE_MAKE_PROGRAM}
+    --build-noclean
+    --build-target install)
+ENDIF(GDCM_TEST_INSTALL)