X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=57973d130ef00d7f6a08e634aa7c3b2808bb62f4;hb=3a9e9df62b3198c4f93d1768074b6be828ac7308;hp=4f427f562eba228c0e94f5fabd27bbca5c18841f;hpb=5285811a83dcd08d4e9364c74ebe1b163688f5bb;p=gdcm.git diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 4f427f56..57973d13 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -1,67 +1,194 @@ -# TODO: -# http://www.cmake.org/pipermail/cmake/2001-November/002491.html -# So that dll is copied to each subdir where needed +# CMakeLists for Testing purpose +# Cxx file that need a file to run should be place aproprietly SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH}) SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests) -#INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) -#CHECK_INCLUDE_FILE("stdint.h" CMAKE_HAVE_STDINT_H) - -#IF(NOT CMAKE_HAVE_STDINT_H) -# SET(GDCM_TEST_COMPILE_FLAGS "-DHAVE_NO_STDINT_H") -#ENDIF(NOT CMAKE_HAVE_STDINT_H) - - +# add test that does not require data: +# They usally return if no argument is given SET(TEST_SOURCES - PrintHeader.cxx #require test.acr - bug1.cxx #require test.acr - dcm2acr.cxx #require test.acr - hashtest.cxx - makeDicomDir.cxx - testDicomDir.cxx - testWrite.cxx + TestUtil.cxx + TestBug.cxx + TestHash.cxx + TestTS.cxx + TestVR.cxx + TestDictGroupName.cxx + TestDict.cxx + TestWriteSimple.cxx + TestImageSet.cxx + TestDicomDirElement.cxx + TestDicomString.cxx ) # add tests that require data IF (GDCM_DATA_ROOT) -SET(TEST_SOURCES ${TEST_SOURCES} - PrintDicomDir.cxx - pourFindTaggs.cxx - testChangeEntete.cxx -) + SET(TEST_SOURCES ${TEST_SOURCES} + TestFileAccessors.cxx + TestMakeIcon.cxx + 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 + ) + # add test that require VTK: + IF(GDCM_VTK) + # Include the VTK library + INCLUDE(${VTK_USE_FILE}) + + INCLUDE_DIRECTORIES( + ${GDCM_SOURCE_DIR}/vtk/ + ) + SET(TEST_SOURCES ${TEST_SOURCES} + VTKTestRead.cxx + VTKTestReadSeq.cxx + VTKTestWrite.cxx + VTKTestWriteSeq.cxx + ) + ENDIF(GDCM_VTK) ENDIF (GDCM_DATA_ROOT) + + # include stuff INCLUDE_DIRECTORIES( ${GDCM_SOURCE_DIR}/src/ ${GDCM_BINARY_DIR}/ ) -CREATE_TEST_SOURCELIST(Tests gdcmCxxTests.cxx ${TEST_SOURCES}) -ADD_EXECUTABLE(gdcmCxxTests ${Tests}) -TARGET_LINK_LIBRARIES(gdcmCxxTests gdcm) -SET (TestsToRun ${Tests}) -REMOVE (TestsToRun gdcmCxxTests.cxx) +CREATE_TEST_SOURCELIST(Tests gdcmTests.cxx ${TEST_SOURCES}) +ADD_EXECUTABLE(gdcmTests ${Tests}) +IF(GDCM_VTK) + TARGET_LINK_LIBRARIES(gdcmTests vtkgdcm vtkRendering) +ELSE(GDCM_VTK) + TARGET_LINK_LIBRARIES(gdcmTests gdcm) +ENDIF(GDCM_VTK) -#ADD_EXECUTABLE(gdcmTests gdcmTests.cxx ${TEST_SOURCES}) -#TARGET_LINK_LIBRARIES(gdcmTests gdcm) +SET (TestsToRun ${Tests}) +REMOVE (TestsToRun gdcmTests.cxx) # Loop over files and create executables FOREACH(file ${TEST_SOURCES}) GET_FILENAME_COMPONENT(name ${file} NAME_WE) -# IF (GDCM_DATA_ROOT) -# ADD_TEST(${TName} ${CXX_TEST_PATH}/gdcmCxxTests ${TName} -# -D ${VTK_DATA_ROOT} -# -T ${VTK_BINARY_DIR}/Testing/Temporary -# -V Baseline/gdcm/${TName}.png) -# ELSE (GDCM_DATA_ROOT) - ADD_TEST(${name} ${GDCM_TESTS} ${name}) - #ADD_TEST(${TName} ${CXX_TEST_PATH}/gdcmCxxTests ${TName}) -# ENDIF (GDCM_DATA_ROOT) + ADD_TEST(${name} ${GDCM_TESTS} ${name}) ENDFOREACH(file ${TEST_SOURCES}) +#----------------------------------------------------------------------------- +# We need to test the reading of all dicom images in the gdcmData directory +# First parse this directory and extract all images +IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) + FILE(GLOB GDCM_DATA_IMAGES_GLOB + "${GDCM_DATA_ROOT}/*.acr" + "${GDCM_DATA_ROOT}/*.dcm" + "${GDCM_DATA_ROOT}/*.nema" + "${GDCM_DATA_ROOT}/*.ima" + ) + FILE(GLOB GDCM_DATA_SEQ_IMAGES_GLOB + "${GDCM_DATA_ROOT}/*FileSeq0.acr" + "${GDCM_DATA_ROOT}/*FileSeq0.dcm" + "${GDCM_DATA_ROOT}/*FileSeq0.nema" + "${GDCM_DATA_ROOT}/*FileSeq0.ima" + ) +ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) + # Since there is a bug in cmake 1.8.3, I'll have to do two separate globs + FILE(GLOB GDCM_DATA_IMAGES_GLOB_ACR + "${GDCM_DATA_ROOT}/*.acr" + ) + FILE(GLOB GDCM_DATA_IMAGES_GLOB_DCM + "${GDCM_DATA_ROOT}/*.dcm" + ) + FILE(GLOB GDCM_DATA_IMAGES_GLOB_NEMA + "${GDCM_DATA_ROOT}/*.nema" + ) + FILE(GLOB GDCM_DATA_IMAGES_GLOB_IMA + "${GDCM_DATA_ROOT}/*.ima" + ) + SET(GDCM_DATA_IMAGES_GLOB + ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR} + ${GDCM_DATA_IMAGES_GLOB_NEMA} ${GDCM_DATA_IMAGES_GLOB_IMA}) + FILE(GLOB GDCM_DATA_SEQ_IMAGES_GLOB_ACR + "${GDCM_DATA_ROOT}/*FileSeq0.acr" + ) + FILE(GLOB GDCM_DATA_SEQ_IMAGES_GLOB_DCM + "${GDCM_DATA_ROOT}/*FileSeq0.dcm" + ) + FILE(GLOB GDCM_DATA_SEQ_IMAGES_GLOB_NEMA + "${GDCM_DATA_ROOT}/*FileSeq0.nema" + ) + FILE(GLOB GDCM_DATA_SEQ_IMAGES_GLOB_IMA + "${GDCM_DATA_ROOT}/*FileSeq0.ima" + ) + SET(GDCM_DATA_SEQ_IMAGES_GLOB + ${GDCM_DATA_SEQ_IMAGES_GLOB_DCM} ${GDCM_DATA_SEQ_IMAGES_GLOB_ACR} + ${GDCM_DATA_SEQ_IMAGES_GLOB_NEMA} ${GDCM_DATA_SEQ_IMAGES_GLOB_IMA}) +ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) + +# Black list of images known to break lots of readers (efilm, xmedcon ...): +SET(BLACK_LIST + + # Multiframe Papyrus format image + # Just to remember this format exists, and is gdcm::File compliant + # (NOT gdcm::FileHelper ...) + # any contribution is welcome + "PET-cardio-Multiframe-Papyrus.dcm" + # From David Clunie's Compresion Dataset + "D_CLUNIE_CT1_JLSN.dcm" + "D_CLUNIE_CT1_JLSL.dcm" + "D_CLUNIE_CT1_J2KR.dcm" + "D_CLUNIE_CT1_J2KI.dcm" + #Not a Dicom Image, but a RT Object + "RS2.16.124.113534.2.3.5.0.120040728.21342.353.12747_anonimized.dcm" + #Temporary black list LibIDO rectangular images + "LIBIDO-24-ACR_NEMA-Rectangle.dcm" + "gdcm-ACR-LibIDO.acr" + ) + +# Add a special test that requires dciodvfy from dicom3tools +INCLUDE(${GDCM_SOURCE_DIR}/CMake/FindDicom3Tools.cmake) + +# This is a GLOB expression, change it into a list separated with a comma and \n +SET(GDCM_DATA_IMAGES) +FOREACH(filename ${GDCM_DATA_IMAGES_GLOB}) + GET_FILENAME_COMPONENT(filename_temp ${filename} NAME) + IF(DCIODVFY_FOUND) + ADD_TEST("DCIODVFY-INPUT-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${filename}") + ADD_TEST("DCIODVFY-OUTPUT-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${GDCM_DATA_ROOT}/BaselineDicom/${filename_temp}") + ENDIF(DCIODVFY_FOUND) + STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST}) + IF(NOT bad_dicom) + SET(GDCM_DATA_IMAGES "${GDCM_DATA_IMAGES}\n\"${filename_temp}\",") + ENDIF(NOT bad_dicom) +ENDFOREACH(filename) + +SET(GDCM_DATA_SEQ_IMAGES) +FOREACH(filename ${GDCM_DATA_SEQ_IMAGES_GLOB}) + GET_FILENAME_COMPONENT(filename_temp ${filename} NAME) + STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST}) + IF(NOT bad_dicom) + STRING(REGEX REPLACE "(.*)FileSeq0(.*)" "\\1FileSeq%d\\2" filename_temp2 ${filename_temp}) + + SET(GDCM_DATA_SEQ_IMAGES "${GDCM_DATA_SEQ_IMAGES}\n\"${filename_temp2}\",") + ENDIF(NOT bad_dicom) +ENDFOREACH(filename) + +# Populate GDCM_DATA_IMAGES: +FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataImages.h" + "const char * const gdcmDataImages[] = { ${GDCM_DATA_IMAGES}\n0 };\n" +) + +# Populate GDCM_DATA_SEQ_IMAGES: +FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataSeqImages.h" + "const char * const gdcmDataSeqImages[] = { ${GDCM_DATA_SEQ_IMAGES}\n0 };\n" +)