Add undocument option for Jpeg Writting (still bugged)

[gdcm.git] / Testing / CMakeLists.txt

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index c534302a3a9f976c518e0ccbd5cd69748e5e6f35..da8c06aa326d994dafc1ceb7e07b54aea3581be0 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -8,6 +8,7 @@ SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 # add test that does not require data:
 # They usally return if no argument is given
 SET(TEST_SOURCES
+  TestEmpty.cxx
   TestUtil.cxx
   TestBug.cxx
   TestHash.cxx
@@ -22,7 +23,7 @@ SET(TEST_SOURCES
   TestDicomDirElement.cxx
   TestDicomString.cxx
   TestEnumVR.cxx
-
+  TestBuildUpDicomDir.cxx          # writes a file named "NewDICOMDIR"
 )
 IF(UNIX)
   SET(TEST_SOURCES ${TEST_SOURCES}
@@ -36,17 +37,18 @@ IF (GDCM_DATA_ROOT)
     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
-    TestReadWriteReadCompare.cxx     # includes generated gdcmDataImages.h 
-    #TestCopyDicom.cxx                # includes generated gdcmDataImages.h 
-    #    TestCopyRescaleDicom.cxx         # includes generated gdcmDataImages.h 
+    #TestLoadAllDocumentsNoShadow.cxx   # includes generated gdcmDataImages.h
+    TestPrintAllDocument.cxx            # includes generated gdcmDataImages.h
+    #TestAllEntryVerify.cxx             # includes generated gdcmDataImages.h
+    TestAllReadCompareDicom.cxx         # includes generated gdcmDataImages.h
+    TestReadWriteReadCompare.cxx        # includes generated gdcmDataImages.h 
+    #TestCopyDicom.cxx                  # includes generated gdcmDataImages.h 
+    #    TestCopyRescaleDicom.cxx       # includes generated gdcmDataImages.h 
     #TestChangeHeader.cxx
     #    TestAnonymize.cxx
     TestDirList.cxx
     TestDicomDir.cxx                 # require DICOMDIR
-    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
@@ -217,4 +219,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)