Pārlūkot izejas kodu

Find dcmtk helper apps for test

Fixes #387

Discovery of helper apps had been in FindDCMTK.cmake, but was omitted
from a previous refactoring.  Since FindDCMTK.cmake may be obsoleted
in the future, the test cmake code now finds the apps directly.
Steve Pieper 11 gadi atpakaļ
vecāks
revīzija
43439fa8e8
1 mainītis faili ar 17 papildinājumiem un 0 dzēšanām
  1. 17 0
      Applications/Testing/Cpp/CMakeLists.txt

+ 17 - 0
Applications/Testing/Cpp/CMakeLists.txt

@@ -29,7 +29,9 @@ if(KIT_TEST_SRCS)
   ## Query / Retrieve Testing
   ## Query / Retrieve Testing
   if(CTK_APP_ctkDICOMQuery AND CTK_APP_ctkDICOMRetrieve)
   if(CTK_APP_ctkDICOMQuery AND CTK_APP_ctkDICOMRetrieve)
 
 
+    #
     # create a dcm query/retrieve service config file that points to the build dir
     # create a dcm query/retrieve service config file that points to the build dir
+    #
     set(DCMQRSCP_STORE_DIR ${CTK_BINARY_DIR}/Testing/Temporary)
     set(DCMQRSCP_STORE_DIR ${CTK_BINARY_DIR}/Testing/Temporary)
     set(ctkDICOMRetrieve_STORE_DIR ${CTK_BINARY_DIR}/Testing/Temporary/ctkDICOMRetrieveStorage)
     set(ctkDICOMRetrieve_STORE_DIR ${CTK_BINARY_DIR}/Testing/Temporary/ctkDICOMRetrieveStorage)
     set(DCMQRSCP_CONFIG ${CTK_BINARY_DIR}/Testing/Temporary/dcmqrscp.cfg)
     set(DCMQRSCP_CONFIG ${CTK_BINARY_DIR}/Testing/Temporary/dcmqrscp.cfg)
@@ -38,6 +40,21 @@ if(KIT_TEST_SRCS)
     set(ctkDICOMQuery_DB_FILE ${CTK_BINARY_DIR}/Testing/Temporary/ctkDICOMApplicationTest1.db)
     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
     # Add Tests
     #
     #