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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 141b9b50b658bb8ec03ca5f5bcb0d4cb439376f7..6889cca46931cf24c0cdc7bdbaf4ed0e2dd71a27 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,11 +22,11 @@ SET(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 \r
 \r
 #-----------------------------------------------------------------------------\r
-#SET (EXECUTABLE_OUTPUT_PATH ${GDCM_SOURCE_DIR}/bin CACHE PATH "Single output directory for building all executables.")\r
-#SET (LIBRARY_OUTPUT_PATH ${OUTPUT_LIB_DIR} CACHE PATH "Single output directory for building all libraries.")\r
+SET (EXECUTABLE_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")\r
+SET (LIBRARY_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")\r
 #MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)\r
-SET(GDCM_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}")\r
-SET(GDCM_EXECUTABLE_PATH "${EXECUTABLE_OUTPUT_PATH}")\r
+#SET(GDCM_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}")\r
+#SET(GDCM_EXECUTABLE_PATH "${EXECUTABLE_OUTPUT_PATH}")\r
 \r
 #-----------------------------------------------------------------------------\r
 # Build directory on which many applications depend\r

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 9e9eae6edc19ea376de06c46965ae0cacee4fa45..29d27646e2a8886bac38aebea69eafa3ef1da0a7 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
 
-SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmCxxTests)
+SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 
 # add test that does not require data:
 # They usally return if no argument is given
@@ -36,17 +36,17 @@ 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)
+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(${name} ${CXX_TEST_PATH}/gdcmCxxTests ${name}
+#    ADD_TEST(${name} ${CXX_TEST_PATH}/gdcmTests ${name}
 #        -D ${GDCM_DATA_ROOT}
 #        -T ${GDCM_BINARY_DIR}/Testing/Temporary
 #        -V Baseline/gdcm/${name}.png)