X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=f5670d92418eccdd5814ef0f39f641f6978b3018;hb=09b0d95c40beffc0b20bf02356b48b79971e157f;hp=d97a4c6ef13bac04be241c2a92ffc93104b91118;hpb=22234afce4e4a326a065e3b9cd4aacc28bb4437e;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index d97a4c6e..f5670d92 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -15,18 +15,25 @@ SET(TEST_SOURCES
   TestVR.cxx
   TestDictGroupName.cxx
   TestDict.cxx
+  TestDataEntry.cxx
   TestWriteSimple.cxx
   TestImageSet.cxx
   TestDicomDirElement.cxx
   TestDicomString.cxx
   #TestValidate.cxx
 )
+IF(UNIX)
+  SET(TEST_SOURCES ${TEST_SOURCES}
+    TestInline.cxx
+  )
+ENDIF(UNIX)
 
 # add tests that require data
 IF (GDCM_DATA_ROOT)
   SET(TEST_SOURCES ${TEST_SOURCES}
     TestFileAccessors.cxx
     TestMakeIcon.cxx
+    TestLoadAllDocumentsNoPrivNoSeq.cxx # includes generated gdcmDataImages.h
     TestPrintAllDocument.cxx         # includes generated gdcmDataImages.h
     #TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
@@ -40,6 +47,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)
@@ -58,7 +66,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
@@ -74,8 +82,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})
@@ -129,17 +137,24 @@ SET(BLACK_LIST
   #I wait to be 100% sure before releasing them. JP
   "rle16sti.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 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"
+  "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"
   )
 
-# Don't understand why jasper is segfaulting with borland...I bet a borland bug
-IF(BORLAND)
-  SET(BLACK_LIST
-    ${BLACK_LIST}
-    "D_CLUNIE_CT1_J2KR.dcm"
-    "D_CLUNIE_CT1_J2KI.dcm"
-    )
-ENDIF(BORLAND)
-
 # Create a specific list of dicom files that we know are part of a sequence
 SET(SEQ_LIST
   "SIEMENS_MAGNETOM-12-MONO2-FileSeq[0-9].dcm"
@@ -177,3 +192,17 @@ FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataImages.h"
 FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataSeqImages.h"
   "const char * const gdcmDataSeqImages[] = { ${GDCM_DATA_SEQ_IMAGES}\n0 };\n" 
 )
+
+#-----------------------------------------------------------------------------
+# Trying to solve a bizarre problem when loading shared lib if gdcm is static
+# Therefore I disable the test when building SHAREDLIBS
+IF(UNIX AND NOT GDCM_BUILD_SHARED_LIBS)
+  ADD_LIBRARY(dynmodule MODULE dynmodule.cxx)
+  TARGET_LINK_LIBRARIES(dynmodule gdcm)
+  ADD_EXECUTABLE(loadmodule loadmodule.cxx )
+  TARGET_LINK_LIBRARIES(loadmodule gdcm -ldl)
+  ADD_TEST(loadmodule ${CXX_TEST_PATH}/loadmodule)
+ENDIF(UNIX AND NOT GDCM_BUILD_SHARED_LIBS)
+
+
+