Update so that exe are forced to a unique place, rename gdcmCxxTest to gdcmTest

[gdcm.git] / Testing / CMakeLists.txt

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 4f427f562eba228c0e94f5fabd27bbca5c18841f..29d27646e2a8886bac38aebea69eafa3ef1da0a7 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -1,35 +1,32 @@
-# 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
+  bug1.cxx
+  dcm2acr.cxx
   hashtest.cxx
-  makeDicomDir.cxx
-  testDicomDir.cxx
   testWrite.cxx
 )
 
 # add tests that require data
 IF (GDCM_DATA_ROOT)
 SET(TEST_SOURCES ${TEST_SOURCES}     
+  PrintHeader.cxx     #require test.acr
   PrintDicomDir.cxx
   pourFindTaggs.cxx
   testChangeEntete.cxx
+  testDicomDir.cxx    #require DICOMDIR
+  BuildUpDicomDir.cxx
+  TestReadWrite.cxx
+
+# Disable makeDicomDir for now
+#  makeDicomDir.cxx
 )
 ENDIF (GDCM_DATA_ROOT)
 
@@ -39,26 +36,22 @@ INCLUDE_DIRECTORIES(
   ${GDCM_BINARY_DIR}/
 )
 
-CREATE_TEST_SOURCELIST(Tests gdcmCxxTests.cxx ${TEST_SOURCES})
-ADD_EXECUTABLE(gdcmCxxTests ${Tests})
-TARGET_LINK_LIBRARIES(gdcmCxxTests gdcm)
+CREATE_TEST_SOURCELIST(Tests gdcmTests.cxx ${TEST_SOURCES})
+ADD_EXECUTABLE(gdcmTests ${Tests})
+TARGET_LINK_LIBRARIES(gdcmTests gdcm)
 SET (TestsToRun ${Tests})
-REMOVE (TestsToRun gdcmCxxTests.cxx)
-
-#ADD_EXECUTABLE(gdcmTests gdcmTests.cxx ${TEST_SOURCES})
-#TARGET_LINK_LIBRARIES(gdcmTests gdcm)
+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)
+#    ADD_TEST(${name} ${CXX_TEST_PATH}/gdcmTests ${name}
+#        -D ${GDCM_DATA_ROOT}
+#        -T ${GDCM_BINARY_DIR}/Testing/Temporary
+#        -V Baseline/gdcm/${name}.png)
 #  ELSE (GDCM_DATA_ROOT)
     ADD_TEST(${name} ${GDCM_TESTS} ${name})
-    #ADD_TEST(${TName} ${CXX_TEST_PATH}/gdcmCxxTests ${TName}) 
 #  ENDIF (GDCM_DATA_ROOT)
 ENDFOREACH(file ${TEST_SOURCES})