X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=9e49ddfcec1331f85bf07c8529b4df341d76b777;hb=fdef18c217469cc507704db6d686ce195e82e4ce;hp=aff9d67aaf65cbac9c5a86500a9987fec10f9562;hpb=e9ed8c97435c5edc950177ff1a0e43b6ce4713b8;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index aff9d67a..9e49ddfc 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -25,6 +25,17 @@ INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src/
 )
 
+<<<<<<< CMakeLists.txt
+SET(dcm2acr_SOURCES
+  dcm2acr.cxx
+)
+ADD_EXECUTABLE(dcm2acr ${dcm2acr_SOURCES})
+
+SET(explDICOMDIR_SOURCES
+  explDICOMDIR.cxx
+)
+ADD_EXECUTABLE(explDICOMDIR ${explDICOMDIR_SOURCES})
+=======
 # Loop over files and create executables
 FOREACH(file ${TEST_SOURCES})
   #Doh ! I need to specify each time the compile flags !
@@ -38,3 +49,4 @@ FOREACH(file ${TEST_SOURCES})
   ADD_EXECUTABLE(${name} ${file})
   TARGET_LINK_LIBRARIES(${name} gdcm)
 ENDFOREACH(file ${TEST_SOURCES})
+>>>>>>> 1.4