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

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 9e49ddfc..aff9d67a 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -25,17 +25,6 @@ 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 !
@@ -49,4 +38,3 @@ FOREACH(file ${TEST_SOURCES})
   ADD_EXECUTABLE(${name} ${file})
   TARGET_LINK_LIBRARIES(${name} gdcm)
 ENDFOREACH(file ${TEST_SOURCES})
->>>>>>> 1.4