X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=0dd7dbc93a8398854ab94e3b40c4d762b1f0328a;hb=33601bb8697e2e1cb2e914aa0864d4cff8cf689f;hp=47f897bf19936d2f3c36765a530dc8a84f5eeec8;hpb=33debb07408180720df41f079c7f0fb60e3b94e7;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 47f897bf..0dd7dbc9 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -27,6 +27,7 @@ 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
@@ -58,7 +59,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,14 +75,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)
@@ -137,7 +140,7 @@ 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, untill I find where is the pb.
+  # 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"
@@ -181,3 +184,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)
+
+
+