Merge branch '80-review-testing-cmakelists'. Closes #80, #81 and #84

* 80-review-testing-cmakelists:
  Factor testing macro and fix some of the DICOM application tests. See #80, #81 and #84

Applications/Testing/Cpp/CMakeLists.txt

@@ -1,76 +1,58 @@
 set(KIT CTKApplication)
 
 set(KIT_TEST_SRCS)
+set(KIT_target_libraries)
 
 ## Query / Retrieve Testing
 if(CTK_APP_ctkDICOMQuery AND CTK_APP_ctkDICOMRetrieve)
   list(APPEND KIT_TEST_SRCS
     ctkDICOMApplicationTest1.cpp
     )
+  ctkFunctionGetTargetLibraries(KIT_target_libraries ${ctkDICOMQuery_SOURCE_DIR})
+  ctkFunctionGetTargetLibraries(KIT_target_libraries ${ctkDICOMRetrieve_SOURCE_DIR})
 endif()
 
-# If there is no tests, exit
-list(LENGTH KIT_TEST_SRCS KIT_TEST_SRCS_LENGTH)
-if(${KIT_TEST_SRCS_LENGTH} EQUAL 0)
-  return()
-endif()
-
-create_test_sourcelist(Tests ${KIT}CppTests.cpp
-  ${KIT_TEST_SRCS}
-  )
-
-SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CppTests.cpp)
-
-# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
-# The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkFunctionGetTargetLibraries(KIT_target_libraries)
+if(KIT_TEST_SRCS)
 
-add_executable(${KIT}CppTests ${Tests})
-target_link_libraries(${KIT}CppTests ${KIT_target_libraries})
-
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
+  create_test_sourcelist(Tests ${KIT}CppTests.cpp
+    ${KIT_TEST_SRCS}
+    )
 
+  SET (TestsToRun ${Tests})
+  REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
-## Query / Retrieve Testing
-if (CTK_APP_ctkDICOMQuery AND CTK_APP_ctkDICOMRetrieve)
+  add_executable(${KIT}CppTests ${Tests})
+  if(KIT_target_libraries)
+    target_link_libraries(${KIT}CppTests ${KIT_target_libraries})
+  endif()
 
-  # create a dcm query/retrieve service config file that points to the build dir
-  set (DCMQRSCP_STORE_DIR ${CTK_BINARY_DIR}/Testing/Temporary)
-  set (ctkDICOMRetrieve_STORE_DIR ${CTK_BINARY_DIR}/Testing/Temporary/ctkDICOMRetrieveStorage)
-  set (DCMQRSCP_CONFIG ${CTK_BINARY_DIR}/Testing/Temporary/dcmqrscp.cfg)
-  configure_file( dcmqrscp.cfg.in ${DCMQRSCP_CONFIG} )
+  ## Query / Retrieve Testing
+  if(CTK_APP_ctkDICOMQuery AND CTK_APP_ctkDICOMRetrieve)
 
-  set(CTK_APPLICATION_RUNTIME_DIRECTORY ${CTK_CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-  if(WIN32)
-    set(CTK_APPLICATION_RUNTIME_DIRECTORY
-          ${CTK_APPLICATION_RUNTIME_DIRECTORY}/${CMAKE_BUILD_TYPE})
-  endif()
+    # create a dcm query/retrieve service config file that points to the build dir
+    set(DCMQRSCP_STORE_DIR ${CTK_BINARY_DIR}/Testing/Temporary)
+    set(ctkDICOMRetrieve_STORE_DIR ${CTK_BINARY_DIR}/Testing/Temporary/ctkDICOMRetrieveStorage)
+    set(DCMQRSCP_CONFIG ${CTK_BINARY_DIR}/Testing/Temporary/dcmqrscp.cfg)
+    configure_file( dcmqrscp.cfg.in ${DCMQRSCP_CONFIG} )
 
-  set(ctkDICOMQuery_EXECUTABLE ${CTK_APPLICATION_RUNTIME_DIRECTORY}/ctkDICOMQuery)
-  set(ctkDICOMQuery_DB_FILE ${CTK_BINARY_DIR}/Testing/Temporary/ctkDICOMApplicationTest1.db)
-  set(ctkDICOMRetrieve_EXECUTABLE ${CTK_APPLICATION_RUNTIME_DIRECTORY}/ctkDICOMRetrieve)
+    set(ctkDICOMQuery_DB_FILE ${CTK_BINARY_DIR}/Testing/Temporary/ctkDICOMApplicationTest1.db)
 
-  #
-  # Add Tests
-  #
+    #
+    # Add Tests
+    #
 
-  add_test( ctkDICOMApplicationTest1 ${KIT_TESTS}
-            ctkDICOMApplicationTest1
+    SIMPLE_TEST( ctkDICOMApplicationTest1
                  ${DCMTK_DCMQRSCP_EXECUTABLE}
                  ${DCMQRSCP_CONFIG}
                  ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA
                  ${CTKData_DIR}/Data/DICOM/MRHEAD/000056.IMA
                  ${DCMTK_STORESCU_EXECUTABLE}
-                 ${ctkDICOMQuery_EXECUTABLE}
+                 $<TARGET_FILE:ctkDICOMQuery>
                  ${ctkDICOMQuery_DB_FILE}
-                 ${ctkDICOMRetrieve_EXECUTABLE}
+                 $<TARGET_FILE:ctkDICOMRetrieve>
                  ${ctkDICOMRetrieve_STORE_DIR}
                  )
-  set_property(TEST ctkDICOMApplicationTest1 PROPERTY LABELS ${PROJECT_NAME})
-endif (CTK_APP_ctkDICOMQuery AND CTK_APP_ctkDICOMRetrieve)
+  endif()
+
+endif()
+

Applications/Testing/Cpp/ctkDICOMApplicationTest1.cpp

@@ -27,39 +27,38 @@
 #include <iostream>
 #include <cstdlib>
 
-  /*
-   * This test performs a full dicom store, query, and retrieve.
-   *
-   * To recreate the parts, from the CTK-superbuild directory, run:
-   *
-
-./CMakeExternals/Install/bin/dcmqrscp -c ./CTK-build/Testing/Temporary/dcmqrscp.cfg -d -v
-
-./CMakeExternals/Install/bin/storescu -aec CTK_AE -aet CTK_AE localhost 11112 ./CMakeExternals/Source/CTKData/Data/DICOM/MRHEAD/*.IMA
-
-./CMakeExternals/Install/bin/findscu -aet CTK_AE -aec COMMONTK -P -k 0010,0010=\* localhost 11112 patqry.dcm
-
-./CTK-build/bin/ctkDICOMQuery /tmp/test.db CTK_AE CTK_AE localhost 11112
-
-
-./CTK-build/bin/ctkDICOMRetrieve 1.2.840.113619.2.135.3596.6358736.5118.1115807980.182  /tmp/hoot CTK_AE 11113 CTK_AE localhost 11112 CTK_CLIENT_AE
-
-As invoked by ctest:
-
-% ./CTK-build/bin/CTKApplicationCppTests ctkDICOMApplicationTest1 \
-    ./CMakeExternals/Install/bin/dcmqrscp ./CTK-build/Testing/Temporary/dcmqrscp.cfg \
-        ./CMakeExternals/Source/CTKData/Data/DICOM/MRHEAD/000055.IMA \
-        ./CMakeExternals/Source/CTKData/Data/DICOM/MRHEAD/000056.IMA \
-    ./CMakeExternals/Install/bin/storescu \
-    ./CTK-build/bin/ctkDICOMQuery \
-    ./CTK-build/Testing/Temporary/ctkDICOMApplicationTest1.db \
-    ./CTK-build/bin/ctkDICOMRetrieve \
-    ./CTK-build/Testing/Temporary/ctkDICOMRetrieveStorage
-
-*/
+//
+//  This test performs a full dicom store, query, and retrieve.
+//
+//  To recreate the parts, from the CTK-superbuild directory, run:
+//
+//
+//  ./CMakeExternals/Install/bin/dcmqrscp -c ./CTK-build/Testing/Temporary/dcmqrscp.cfg -d -v
+//
+//  ./CMakeExternals/Install/bin/storescu -aec CTK_AE -aet CTK_AE localhost 11112 ./CMakeExternals/Source/CTKData/Data/DICOM/MRHEAD/*.IMA
+//
+//  ./CMakeExternals/Install/bin/findscu -aet CTK_AE -aec COMMONTK -P -k 0010,0010=\* localhost 11112 patqry.dcm
+//
+//  ./CTK-build/bin/ctkDICOMQuery /tmp/test.db CTK_AE CTK_AE localhost 11112
+//
+//
+//  ./CTK-build/bin/ctkDICOMRetrieve 1.2.840.113619.2.135.3596.6358736.5118.1115807980.182  /tmp/hoot CTK_AE 11113 CTK_AE localhost 11112 CTK_CLIENT_AE
+//
+//  As invoked by ctest:
+//
+//  % ./CTK-build/bin/CTKApplicationCppTests ctkDICOMApplicationTest1 \
+//      ./CMakeExternals/Install/bin/dcmqrscp ./CTK-build/Testing/Temporary/dcmqrscp.cfg \
+//          ./CMakeExternals/Source/CTKData/Data/DICOM/MRHEAD/000055.IMA \
+//          ./CMakeExternals/Source/CTKData/Data/DICOM/MRHEAD/000056.IMA \
+//      ./CMakeExternals/Install/bin/storescu \
+//      ./CTK-build/bin/ctkDICOMQuery \
+//      ./CTK-build/Testing/Temporary/ctkDICOMApplicationTest1.db \
+//      ./CTK-build/bin/ctkDICOMRetrieve \
+//      ./CTK-build/Testing/Temporary/ctkDICOMRetrieveStorage
+//
 
 int ctkDICOMApplicationTest1(int argc, char * argv []) {
-  
+
   QCoreApplication app(argc, argv);
   QTextStream out(stdout);
 

Applications/Testing/Cpp/target_libraries.cmake

@@ -1,15 +0,0 @@
-#
-# See CMake/ctkFunctionGetTargetLibraries.cmake
-# 
-# This file should list the libraries required to build the current CTK application.
-# 
-
-set(target_libraries
-  )
-
-## Query / Retrieve Testing
-if(CTK_APP_ctkDICOMQuery AND CTK_APP_ctkDICOMRetrieve)
-  list(APPEND target_libraries 
-    CTKDICOMCore
-    )
-endif()

Applications/ctkDICOM/Testing/Cpp/CMakeLists.txt

@@ -8,23 +8,14 @@ SET (TestsToRun ${Tests})
 REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
 # Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
-# The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkFunctionGetTargetLibraries(KIT_target_libraries)
+# The following macro will read the target libraries from the file '<KIT_SOURCE_DIR>/target_libraries.cmake'
+ctkFunctionGetTargetLibraries(KIT_target_libraries ${${KIT}_SOURCE_DIR})
 
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${KIT_target_libraries})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-if(WIN32)
-  set(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
-endif()
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #
-SIMPLE_TEST(ctkDICOMTest1)
+
+SIMPLE_TEST(ctkDICOMTest1 $<TARGET_FILE:ctkDICOM>)

Applications/ctkDICOM/Testing/Cpp/ctkDICOMTest1.cpp

@@ -29,7 +29,14 @@
 int ctkDICOMTest1(int argc, char * argv [])
 {
   QCoreApplication app(argc, argv);
-  QString command = QString("ctkDICOM");
+  if (app.arguments().count() != 2)
+    {
+    std::cerr << "Line " << __LINE__ << " - Failed to run " << argv[0] << "\n"
+              << "Usage:\n"
+              << "  " << argv[0] << " /path/to/ctkDICOM";
+    return EXIT_FAILURE;
+    }
+  QString command = app.arguments().at(1);
   QProcess process;
   process.start(command);
   bool res = process.waitForStarted();

Applications/ctkDICOM/Testing/Cpp/target_libraries.cmake

@@ -1,15 +0,0 @@
-#
-# See CMake/ctkFunctionGetTargetLibraries.cmake
-# 
-# This file should list the libraries required to build the current CTK application.
-# 
-
-set(target_libraries
-  )
-
-## Query / Retrieve Testing
-if(CTK_APP_ctkDICOMQuery AND CTK_APP_ctkDICOMRetrieve)
-  list(APPEND target_libraries 
-    CTKDICOMCore
-    )
-endif()

Applications/ctkDICOM/ctkDICOMMain.cpp

@@ -40,7 +40,6 @@
 
 int main(int argc, char** argv)
 {
-  ctkLogger::configure();
   QApplication app(argc, argv);
 
   app.setOrganizationName("commontk");
@@ -53,7 +52,7 @@ int main(int argc, char** argv)
   QSettings settings;
   QString databaseDirectory;
 
-  // set up the database 
+  // set up the database
   if (argc > 1)
   {
     QString directory(argv[1]);
@@ -71,7 +70,7 @@ int main(int argc, char** argv)
   }
 
   QDir qdir(databaseDirectory);
-  if ( !qdir.exists(databaseDirectory) ) 
+  if ( !qdir.exists(databaseDirectory) )
   {
     if ( !qdir.mkpath(databaseDirectory) )
     {

Applications/ctkDICOMDemoSCU/Testing/Cpp/CMakeLists.txt

@@ -8,22 +8,12 @@ SET (TestsToRun ${Tests})
 REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
 # Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
-# The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkFunctionGetTargetLibraries(KIT_target_libraries)
+# The following macro will read the target libraries from the file '<KIT_SOURCE_DIR>/target_libraries.cmake'
+ctkFunctionGetTargetLibraries(KIT_target_libraries ${${KIT}_SOURCE_DIR})
 
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${KIT_target_libraries})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-if(WIN32)
-  set(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
-endif()
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #

Applications/ctkDICOMIndexer/Testing/Cpp/CMakeLists.txt

@@ -8,23 +8,13 @@ SET (TestsToRun ${Tests})
 REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
 # Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
-# The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkFunctionGetTargetLibraries(KIT_target_libraries)
+# The following macro will read the target libraries from the file '<KIT_SOURCE_DIR>/target_libraries.cmake'
+ctkFunctionGetTargetLibraries(KIT_target_libraries ${${KIT}_SOURCE_DIR})
 
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${KIT_target_libraries})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-if(WIN32)
-  set(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
-endif()
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #
-SIMPLE_TEST(ctkDICOMIndexerTest1)
+SIMPLE_TEST( ctkDICOMIndexerTest1 )

Applications/ctkDICOMIndexer/Testing/Cpp/target_libraries.cmake

@@ -1,15 +0,0 @@
-#
-# See CMake/ctkFunctionGetTargetLibraries.cmake
-# 
-# This file should list the libraries required to build the current CTK application.
-# 
-
-set(target_libraries
-  )
-
-## Query / Retrieve Testing
-if(CTK_APP_ctkDICOMQuery AND CTK_APP_ctkDICOMRetrieve)
-  list(APPEND target_libraries 
-    CTKDICOMCore
-    )
-endif()

Applications/ctkDICOMQuery/ctkDICOMQueryMain.cpp

@@ -65,9 +65,7 @@ void print_usage()
 */
 int main(int argc, char** argv)
 {
-  ctkLogger::configure();
   ctkLogger logger ( "org.commontk.core.Logger" );
-  logger.setDebug();
 
   if (argc < 5)
   {

Applications/ctkDICOMQueryRetrieve/Testing/Cpp/CMakeLists.txt

@@ -6,20 +6,12 @@ create_test_sourcelist(Tests ${KIT}CppTests.cpp
 SET (TestsToRun ${Tests})
 REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
-set(LIBRARY_NAME ${PROJECT_NAME})
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
+# The following macro will read the target libraries from the file '<KIT_SOURCE_DIR>/target_libraries.cmake'
+ctkFunctionGetTargetLibraries(KIT_target_libraries ${${KIT}_SOURCE_DIR})
 
 add_executable(${KIT}CppTests ${Tests})
-target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
-
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-if(WIN32)
-  set(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
-endif()
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
+target_link_libraries(${KIT}CppTests ${KIT_target_libraries})
 
 #
 # Add Tests

Applications/ctkDICOMQueryRetrieve/ctkDICOMQueryRetrieveMain.cpp

@@ -39,7 +39,6 @@
 
 int main(int argc, char** argv)
 {
-  ctkLogger::configure();
   // Set the DCMTK log level to debug
   dcmtk::log4cplus::Logger rootLogger = dcmtk::log4cplus::Logger::getRoot();
   rootLogger.setLogLevel(dcmtk::log4cplus::DEBUG_LOG_LEVEL);
@@ -53,7 +52,7 @@ int main(int argc, char** argv)
   QSettings settings;
   QString databaseDirectory;
 
-  // set up the database 
+  // set up the database
   if (argc > 1)
   {
     QString directory(argv[1]);
@@ -71,7 +70,7 @@ int main(int argc, char** argv)
   }
 
   QDir qdir(databaseDirectory);
-  if ( !qdir.exists(databaseDirectory) ) 
+  if ( !qdir.exists(databaseDirectory) )
   {
     if ( !qdir.mkpath(databaseDirectory) )
     {

Applications/ctkDICOMRetrieve/ctkDICOMRetrieveMain.cpp

@@ -48,9 +48,8 @@ void print_usage()
 */
 int main(int argc, char** argv)
 {
-  ctkLogger::configure();
   ctkLogger logger ( "org.commontk.dicom.DICOMRetieveApp" );
-  logger.setDebug();
+
   // Set the DCMTK log level to debug
   dcmtk::log4cplus::Logger rootLogger = dcmtk::log4cplus::Logger::getRoot();
   rootLogger.setLogLevel(dcmtk::log4cplus::DEBUG_LOG_LEVEL);

Applications/ctkSimplePythonShell/Testing/Python/CMakeLists.txt

@@ -26,12 +26,7 @@ if(CTK_LIB_Scripting/Python/Core_PYTHONQT_USE_VTK)
     )
 endif()
 
-
-macro(SIMPLE_TEST_WITH_SCRIPT SCRIPT)
-  get_filename_component(TESTNAME ${SCRIPT} NAME_WE)
-  add_test(ctkSimplePythonShell_${TESTNAME} ${KIT_TESTS} ${CMAKE_CURRENT_SOURCE_DIR}/${SCRIPT})
-endmacro()
-
 foreach(s ${SCRIPTS})
-  SIMPLE_TEST_WITH_SCRIPT(${s})
+  get_filename_component(TESTNAME ${s} NAME_WE)
+  SIMPLE_TEST(ctkSimplePythonShell_${TESTNAME} ${CMAKE_CURRENT_SOURCE_DIR}/${SCRIPT})
 endforeach()

CMake/ctkMacroBuildLib.cmake

@@ -65,6 +65,10 @@ macro(ctkMacroBuildLib)
   include_directories(
     ${my_includes}
     )
+  #message(lib_name:${lib_name})
+  #foreach(i ${my_includes})
+  #  message(i:${i})
+  #endforeach()
 
   # Add the library directories from the external project
   ctkFunctionGetLibraryDirs(my_library_dirs ${lib_name})

CMakeExternals/DCMTK.cmake

@@ -29,39 +29,39 @@ if(${add_project})
       endif()
 
   #     message(STATUS "Adding project:${proj}")
-      # Set CMake OSX variable to pass down the external project
-      set(CMAKE_OSX_EXTERNAL_PROJECT_ARGS)
-      if(APPLE)
-        list(APPEND CMAKE_OSX_EXTERNAL_PROJECT_ARGS
-          -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-          -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
-          -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET})
-      endif()
-      ExternalProject_Add(${proj}
-        SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
-        BINARY_DIR ${proj}-build
-        PREFIX ${proj}${ep_suffix}
-        GIT_REPOSITORY "${git_protocol}://git.dcmtk.org/dcmtk.git"
-        GIT_TAG ${revision_tag}
-        CMAKE_GENERATOR ${gen}
-        UPDATE_COMMAND ""
-        BUILD_COMMAND ""
-        CMAKE_CACHE_ARGS
-          -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-          -DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}
-          -DCMAKE_C_FLAGS:STRING=${ep_common_c_flags}
-          -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir}
-          -DDCMTK_WITH_ZLIB:BOOL=OFF # see github issue #25
-          -DDCMTK_WITH_OPENSSL:BOOL=OFF # see github issue #25
-          -DDCMTK_WITH_PNG:BOOL=OFF # see github issue #25
-          -DDCMTK_WITH_TIFF:BOOL=OFF  # see github issue #25
-          -DDCMTK_WITH_XML:BOOL=OFF  # see github issue #25
-          -DDCMTK_FORCE_FPIC_ON_UNIX:BOOL=ON
-          ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
-          #-DBUILD_TESTING:BOOL=OFF # Not used
-          -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS:BOOL=OFF
-        )
-      set(DCMTK_DIR ${ep_install_dir})
+    # Set CMake OSX variable to pass down the external project
+    set(CMAKE_OSX_EXTERNAL_PROJECT_ARGS)
+    if(APPLE)
+      list(APPEND CMAKE_OSX_EXTERNAL_PROJECT_ARGS
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+        -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET})
+    endif()
+    ExternalProject_Add(${proj}
+      SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
+      BINARY_DIR ${proj}-build
+      PREFIX ${proj}${ep_suffix}
+      GIT_REPOSITORY "file:///home/jchris/Projects/sandbox/dcmtk-git/dcmtk"
+      GIT_TAG ${revision_tag}
+      CMAKE_GENERATOR ${gen}
+      UPDATE_COMMAND ""
+      BUILD_COMMAND ""
+      CMAKE_CACHE_ARGS
+        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+        -DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}
+        -DCMAKE_C_FLAGS:STRING=${ep_common_c_flags}
+        -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir}
+        -DDCMTK_WITH_ZLIB:BOOL=OFF # see github issue #25
+        -DDCMTK_WITH_OPENSSL:BOOL=OFF # see github issue #25
+        -DDCMTK_WITH_PNG:BOOL=OFF # see github issue #25
+        -DDCMTK_WITH_TIFF:BOOL=OFF  # see github issue #25
+        -DDCMTK_WITH_XML:BOOL=OFF  # see github issue #25
+        -DDCMTK_FORCE_FPIC_ON_UNIX:BOOL=ON
+        ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
+        #-DBUILD_TESTING:BOOL=OFF # Not used
+        -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS:BOOL=OFF
+      )
+    set(DCMTK_DIR ${ep_install_dir})
 
   # This was used during heavy development on DCMTK itself.
   # Disabling it for now. (It also leads to to build errors

CMakeLists.txt

@@ -216,6 +216,9 @@ if(BUILD_TESTING)
   set(CPP_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
   mark_as_advanced(TCL_TCLSH DART_ROOT)
 
+  include(CMake/ctkMacroSimpleTest.cmake)
+  include(CMake/ctkMacroSimpleTestWithData.cmake)
+
   # Setup file for setting custom ctest vars
   configure_file(
     CMake/CTestCustom.cmake.in

Libs/Core/Testing/Cpp/CMakeLists.txt

@@ -68,8 +68,8 @@ create_test_sourcelist(Tests ${KIT}CppTests.cpp
   #EXTRA_INCLUDE TestingMacros.h
   )
 
-SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CppTests.cpp)
+SET(TestsToRun ${Tests})
+REMOVE(TestsToRun ${KIT}CppTests.cpp)
 
 set(LIBRARY_NAME ${PROJECT_NAME})
 
@@ -107,11 +107,6 @@ endif()
 add_executable(${KIT}CppTests ${Tests} ${Tests_Helpers_SRCS} ${Tests_Helpers_MOC_CPP})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES} CTKDummyPlugin)
 
-macro( SIMPLE_TEST  TESTNAME )
-  add_test(NAME ${TESTNAME} COMMAND $<TARGET_FILE:${KIT}CppTests> ${TESTNAME} ${ARGN})
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #

Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(KIT ${PROJECT_NAME})
 
 create_test_sourcelist(Tests ${KIT}CppTests.cpp
+  ctkDICOMCoreTest1.cpp
   ctkDICOMDatabaseTest1.cpp
   ctkDICOMDatasetTest1.cpp
   ctkDICOMIndexerTest1.cpp
@@ -10,7 +11,6 @@ create_test_sourcelist(Tests ${KIT}CppTests.cpp
   ctkDICOMQueryTest2.cpp
   ctkDICOMRetrieveTest1.cpp
   ctkDICOMRetrieveTest2.cpp
-  ctkDICOMTest1.cpp
   ctkDICOMTesterTest1.cpp
   ctkDICOMTesterTest2.cpp
   )
@@ -23,46 +23,45 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #
+
+# ctkDICOMDatabase
 SIMPLE_TEST(ctkDICOMDatabaseTest1)
 SIMPLE_TEST(ctkDICOMDatasetTest1)
 SIMPLE_TEST(ctkDICOMIndexerTest1 )
 
-add_test( ctkDICOMModelTest1 ${KIT_TESTS}
-          ctkDICOMModelTest1 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db
-                             ${CMAKE_CURRENT_SOURCE_DIR}/../../Resources/dicom-sample.sql)
-set_property(TEST ctkDICOMModelTest1 PROPERTY LABELS ${PROJECT_NAME})
+# ctkDICOMModel
+SIMPLE_TEST(ctkDICOMModelTest1
+  ${CMAKE_CURRENT_BINARY_DIR}/dicom.db
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../Resources/dicom-sample.sql
+  )
 SIMPLE_TEST(ctkDICOMPersonNameTest1)
 
 # ctkDICOMQuery
 SIMPLE_TEST( ctkDICOMQueryTest1)
-add_test( ctkDICOMQueryTest2 ${KIT_TESTS}
-          ctkDICOMQueryTest2 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA ${CTKData_DIR}/Data/DICOM/MRHEAD/000056.IMA)
-set_property(TEST ctkDICOMQueryTest2 PROPERTY LABELS ${PROJECT_NAME})
+SIMPLE_TEST( ctkDICOMQueryTest2
+  ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA
+  ${CTKData_DIR}/Data/DICOM/MRHEAD/000056.IMA
+  )
 
 # ctkDICOMRetrieve
 SIMPLE_TEST( ctkDICOMRetrieveTest1)
-add_test( ctkDICOMRetrieveTest2 ${KIT_TESTS}
-          ctkDICOMRetrieveTest2 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA ${CTKData_DIR}/Data/DICOM/MRHEAD/000056.IMA)
-set_property(TEST ctkDICOMRetrieveTest2 PROPERTY LABELS ${PROJECT_NAME})
+SIMPLE_TEST( ctkDICOMRetrieveTest2
+  ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA
+  ${CTKData_DIR}/Data/DICOM/MRHEAD/000056.IMA
+  )
 
-# ctkDICOMTest
-add_test( ctkDICOMTest1 ${KIT_TESTS}
-          ctkDICOMTest1 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db
-                        ${CMAKE_CURRENT_SOURCE_DIR}/../../Resources/dicom-sample.sql)
-set_property(TEST ctkDICOMTest1 PROPERTY LABELS ${PROJECT_NAME})
+# ctkDICOMCore
+SIMPLE_TEST( ctkDICOMCoreTest1
+  ${CMAKE_CURRENT_BINARY_DIR}/dicom.db
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../Resources/dicom-sample.sql
+  )
 
 # ctkDICOMTester
-SIMPLE_TEST(ctkDICOMTesterTest1)
-add_test( ctkDICOMTesterTest2 ${KIT_TESTS}
-          ctkDICOMTesterTest2 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA ${CTKData_DIR}/Data/DICOM/MRHEAD/000056.IMA)
-set_property(TEST ctkDICOMTesterTest2 PROPERTY LABELS ${PROJECT_NAME})
+SIMPLE_TEST( ctkDICOMTesterTest1 )
+SIMPLE_TEST( ctkDICOMTesterTest2
+  ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA
+  ${CTKData_DIR}/Data/DICOM/MRHEAD/000056.IMA
+  )

Libs/DICOM/Core/Testing/Cpp/ctkDICOMTest1.cpp

@@ -30,8 +30,8 @@
 #include <iostream>
 #include <cstdlib>
 
-int ctkDICOMTest1(int argc, char * argv []) {
-  
+int ctkDICOMCoreTest1(int argc, char * argv []) {
+
   QCoreApplication app(argc, argv);
   QTextStream out(stdout);
   try
@@ -48,7 +48,7 @@ int ctkDICOMTest1(int argc, char * argv []) {
        out << "ERROR: sample DB init failed";
        return EXIT_FAILURE;
     };
-    myCTK.closeDatabase(); 
+    myCTK.closeDatabase();
     }
   catch (std::exception e)
   {

Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -151,8 +151,6 @@ void ctkDICOMIndexer::addFile(ctkDICOMDatabase& ctkDICOMDatabase,
 {
   Q_D(ctkDICOMIndexer);
 
-  logger.setDebug();
-
   DcmFileFormat fileformat;
   DcmDataset *dataset;
 

Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt

@@ -22,35 +22,20 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #
 
 SIMPLE_TEST(ctkDICOMAppWidgetTest1)
-add_test( ctkDICOMDatasetViewTest1  ${KIT_TESTS} 
-          ctkDICOMDatasetViewTest1  ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
-set_property(TEST ctkDICOMDatasetViewTest1 PROPERTY LABELS ${PROJECT_NAME})
+SIMPLE_TEST(ctkDICOMDatasetViewTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
 SIMPLE_TEST(ctkDICOMDirectoryListWidgetTest1)
-
-add_test( ctkDICOMImageTest1 ${KIT_TESTS}
-          ctkDICOMImageTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
-set_property(TEST ctkDICOMImageTest1 PROPERTY LABELS ${PROJECT_NAME})
-
+SIMPLE_TEST(ctkDICOMImageTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
 SIMPLE_TEST(ctkDICOMImportWidgetTest1)
 SIMPLE_TEST(ctkDICOMListenerWidgetTest1)
-
-add_test( ctkDICOMModelTest2 ${KIT_TESTS}
-          ctkDICOMModelTest2 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db
-                             ${CMAKE_CURRENT_SOURCE_DIR}/../../../Core/Resources/dicom-sample.sql)
-set_property(TEST ctkDICOMModelTest2 PROPERTY LABELS ${PROJECT_NAME})
-
+SIMPLE_TEST(ctkDICOMModelTest2
+  ${CMAKE_CURRENT_BINARY_DIR}/dicom.db
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../../Core/Resources/dicom-sample.sql
+  )
 SIMPLE_TEST(ctkDICOMQueryRetrieveWidgetTest1)
 SIMPLE_TEST(ctkDICOMQueryResultsTabWidgetTest1)
 SIMPLE_TEST(ctkDICOMThumbnailListWidgetTest1)

Libs/ImageProcessing/ITK/Core/Testing/Cpp/CMakeLists.txt

@@ -52,17 +52,6 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests} ${KIT_HELPER_SRCS})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME}
-            -D ${CTKData_DIR}/Data
-            -V ${CTKData_DIR}/Baseline/Libs/Visualization/VTK/Core/${TESTNAME}.png
-            -T ${CTK_BINARY_DIR}/Testing/Temporary
-            )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #
@@ -74,6 +63,7 @@ SIMPLE_TEST( ctkITKErrorLogModelTest1 )
 # Add Tests expecting CTKData to be set
 #
 if(EXISTS "${CTKData_DIR}")
-
+  set(baseline_relative_location "Libs/ImageProcessing/ITK/Core")
+  #SIMPLE_TEST(Foo ${baseline_relative_location}/${TESTNAME}.png)
 endif()
 

Libs/Messaging/Core/Testing/CMakeLists.txt

@@ -13,15 +13,8 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #
 
-SIMPLE_TEST( ctkMessagingServerTest1 )
+SIMPLE_TEST( ctkMessagingServerTest1 )

Libs/ModuleDescription/Testing/Cpp/CMakeLists.txt

@@ -12,13 +12,6 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #

Libs/Scripting/Python/Core/Testing/Cpp/CMakeLists.txt

@@ -13,13 +13,6 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #

Libs/Scripting/Python/Widgets/Testing/Cpp/CMakeLists.txt

@@ -13,13 +13,6 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #

Libs/Visualization/VTK/Core/Testing/Cpp/CMakeLists.txt

@@ -61,17 +61,6 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests} ${KIT_HELPER_SRCS})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME}
-            -D ${CTKData_DIR}/Data
-            -V ${CTKData_DIR}/Baseline/Libs/Visualization/VTK/Core/${TESTNAME}.png
-            -T ${CTK_BINARY_DIR}/Testing/Temporary
-            )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #
@@ -91,6 +80,7 @@ SIMPLE_TEST( ctkVTKTransferFunctionRepresentationTest1 )
 # Add Tests expecting CTKData to be set
 #
 if(EXISTS "${CTKData_DIR}")
-  SIMPLE_TEST( vtkLightBoxRendererManagerTest1 )
+  set(baseline_relative_location "Libs/Visualization/VTK/Core")
+  SIMPLE_TEST_WITH_DATA( vtkLightBoxRendererManagerTest1 ${baseline_relative_location}/vtkLightBoxRendererManagerTest1.png)
 endif()
 

Libs/Visualization/VTK/Widgets/Testing/Cpp/CMakeLists.txt

@@ -63,27 +63,6 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} vtkCharts ${CTK_BASE_LIBRARIES})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME}
-            -D "${CTKData_DIR}/Data"
-            -V "${CTKData_DIR}/Baseline/Libs/Visualization/VTK/Widgets"
-            )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
-macro( MAGNIFY_WIDGET_TEST  TESTNAME  TESTTYPE  SIZE  MAGNIFICATION)
-  add_test( ${TESTNAME}${TESTTYPE} ${KIT_TESTS} ${TESTNAME}
-            -D "${CTKData_DIR}/Data"
-            -V "${CTKData_DIR}/Baseline/Libs/Visualization/VTK/Widgets"
-            -T "${TESTTYPE}"
-            -S "${SIZE}"
-            -M "${MAGNIFICATION}"
-            )
-  set_property(TEST ${TESTNAME}${TESTTYPE} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( MAGNIFY_WIDGET_TEST  )
-
 #
 # Add Tests
 #
@@ -101,7 +80,7 @@ SIMPLE_TEST( ctkTransferFunctionViewTest2 )
 SIMPLE_TEST( ctkTransferFunctionViewTest3 )
 SIMPLE_TEST( ctkTransferFunctionViewTest4 )
 SIMPLE_TEST( ctkTransferFunctionViewTest5 )
-IF (CTK_USE_CHARTS)
+IF(CTK_USE_CHARTS)
   SIMPLE_TEST( ctkVTKChartViewTest1 )
   SIMPLE_TEST( ctkVTKVolumePropertyWidgetTest1 )
   SIMPLE_TEST( ctkVTKScalarsToColorsViewTest1 )
@@ -123,6 +102,16 @@ SIMPLE_TEST( ctkVTKWidgetsUtilsTestGrabWidget )
 # Add Tests expecting CTKData to be set
 #
 if(EXISTS "${CTKData_DIR}")
+  set(baseline_relative_location Libs/Visualization/VTK/Widgets)
+
+  macro(MAGNIFY_WIDGET_TEST TESTNAME TESTTYPE SIZE MAGNIFICATION)
+    SIMPLE_TEST_WITH_DATA(${TESTNAME}${TESTTYPE} ${baseline_relative_location}
+      -T "${TESTTYPE}"
+      -S "${SIZE}"
+      -M "${MAGNIFICATION}"
+      )
+  endmacro()
+
   #
   # Dependencies required so that these tests won't run in parallel
   #
@@ -139,7 +128,8 @@ if(EXISTS "${CTKData_DIR}")
   set_tests_properties( ctkVTKMagnifyViewTest2EvenOdd
                         PROPERTIES DEPENDS
                         ctkVTKMagnifyViewTest2OddEven )
-  SIMPLE_TEST( ctkVTKSliceViewTest2 )
-  SIMPLE_TEST( ctkVTKRenderViewTest2 )
+
+  SIMPLE_TEST_WITH_DATA( ctkVTKRenderViewTest2 ${baseline_relative_location})
+  SIMPLE_TEST_WITH_DATA( ctkVTKSliceViewTest2 ${baseline_relative_location})
 endif()
 

Libs/Visualization/XIP/Testing/Cpp/CMakeLists.txt

@@ -11,13 +11,6 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #

Libs/Widgets/Testing/Cpp/CMakeLists.txt

@@ -94,8 +94,8 @@ create_test_sourcelist(Tests ${KIT}CppTests.cxx
   ${TEST_SOURCES}
   )
 
-SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CppTests.cxx)
+set(TestsToRun ${Tests})
+remove(TestsToRun ${KIT}CppTests.cxx)
 
 set(LIBRARY_NAME ${PROJECT_NAME})
 
@@ -121,16 +121,6 @@ QT4_GENERATE_MOCS(ctkRangeSliderTest.cpp)
 add_executable(${KIT}CppTests ${Tests} ${Tests_SRCS} ${Tests_MOC_CPP})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME}
-            -D "${CTKData_DIR}/Data"
-            -V "${CTKData_DIR}/Baseline/Libs/Widgets"
-            )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #
@@ -214,5 +204,6 @@ SIMPLE_TEST( ctkWorkflowWidgetTest2 )
 # Add Tests expecting CTKData to be set
 #
 if(EXISTS "${CTKData_DIR}")
-  SIMPLE_TEST( ctkCrosshairLabelTest2 )
+  set(baseline_relative_location "Libs/Widgets") 
+  SIMPLE_TEST_WITH_DATA( ctkCrosshairLabelTest2 ${baseline_relative_location})
 endif()

Plugins/org.commontk.dah.core/Testing/Cpp/CMakeLists.txt

@@ -13,13 +13,6 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
 
-set(KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-macro( SIMPLE_TEST  TESTNAME )
-  add_test( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST )
-
 #
 # Add Tests
 #

Plugins/org.commontk.slicermodule/Testing/Cpp/CMakeLists.txt

@@ -12,18 +12,11 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-set( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
 set(TEST_DATA ${${PROJECT_NAME}_SOURCE_DIR}/TestData)
 
-macro( SIMPLE_TEST  TESTNAME DATA_FILE )
-  add_test( ${TESTNAME} "${KIT_TESTS}" "${TESTNAME}" "${TEST_DATA}/${DATA_FILE}" )
-  set_property(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-endmacro( SIMPLE_TEST  )
-
 #
 # Add Tests
 #
 
-SIMPLE_TEST( ctkSlicerModuleTest ParserTest1.xml )
+SIMPLE_TEST( ctkSlicerModuleTest ${TEST_DATA}/ParserTest1.xml )