Merge branch '387-dicom-test-cmake'

* 387-dicom-test-cmake:
  Clean up cmake code for test

Applications/Testing/Cpp/CMakeLists.txt

@@ -1,75 +1,49 @@
-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(KIT_TEST_SRCS)
-
-  create_test_sourcelist(Tests ${KIT}CppTests.cpp
-    ${KIT_TEST_SRCS}
+  #
+  # 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_DB_FILE ${CTK_BINARY_DIR}/Testing/Temporary/ctkDICOMApplicationTest1.db)
+
+  #
+  # find the helper executables
+  #
+  find_program(DCMTK_DCMQRSCP_EXECUTABLE dcmqrscp
+    PATHS
+      ${DCMTK_DIR}/bin
+    NO_DEFAULT_PATH
     )
 
-  SET (TestsToRun ${Tests})
-  REMOVE (TestsToRun ${KIT}CppTests.cpp)
-
-  add_executable(${KIT}CppTests ${Tests})
-  if(KIT_target_libraries)
-    target_link_libraries(${KIT}CppTests ${KIT_target_libraries})
-  endif()
-
-  ## Query / Retrieve Testing
-  if(CTK_APP_ctkDICOMQuery AND CTK_APP_ctkDICOMRetrieve)
-
-    #
-    # 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_DB_FILE ${CTK_BINARY_DIR}/Testing/Temporary/ctkDICOMApplicationTest1.db)
-
-    #
-    # find the helper executables
-    #
-    find_program(DCMTK_DCMQRSCP_EXECUTABLE dcmqrscp
-      PATHS
-        ${DCMTK_DIR}/bin
-      NO_DEFAULT_PATH
-      )
-
-    find_program(DCMTK_STORESCU_EXECUTABLE storescu
-      PATHS
-        ${DCMTK_DIR}/bin
-      NO_DEFAULT_PATH
-      )
-
-    #
-    # Add Tests
-    #
-
-    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}
-                 $<TARGET_FILE:ctkDICOMQuery>
-                 ${ctkDICOMQuery_DB_FILE}
-                 $<TARGET_FILE:ctkDICOMRetrieve>
-                 ${ctkDICOMRetrieve_STORE_DIR}
-                 )
-  endif()
+  find_program(DCMTK_STORESCU_EXECUTABLE storescu
+    PATHS
+      ${DCMTK_DIR}/bin
+    NO_DEFAULT_PATH
+    )
 
+  #
+  # Add Tests
+  #
+  add_executable(ctkDICOMApplicationTest1 ctkDICOMApplicationTest1.cpp)
+  target_link_libraries(ctkDICOMApplicationTest1 ${QT_LIBRARIES})
+
+  ADD_TEST( NAME ctkDICOMApplicationTest1 
+            COMMAND 
+            $<TARGET_FILE:ctkDICOMApplicationTest1>
+               ${DCMTK_DCMQRSCP_EXECUTABLE}
+               ${DCMQRSCP_CONFIG}
+               ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA
+               ${CTKData_DIR}/Data/DICOM/MRHEAD/000056.IMA
+               ${DCMTK_STORESCU_EXECUTABLE}
+               $<TARGET_FILE:ctkDICOMQuery>
+               ${ctkDICOMQuery_DB_FILE}
+               $<TARGET_FILE:ctkDICOMRetrieve>
+               ${ctkDICOMRetrieve_STORE_DIR}
+               )
 endif()
 

Applications/Testing/Cpp/ctkDICOMApplicationTest1.cpp

@@ -57,7 +57,7 @@
 //      ./CTK-build/Testing/Temporary/ctkDICOMRetrieveStorage
 //
 
-int ctkDICOMApplicationTest1(int argc, char * argv []) {
+int main(int argc, char * argv []) {
 
   QCoreApplication app(argc, argv);
   QTextStream out(stdout);