Преглед на файлове

Merge branch '454-fix-configure-with-ctkdicom2'

* 454-fix-configure-with-ctkdicom2:
  Fixes CTK configuration renaming ctkDICOM2 application test. Fixes #454
Jean-Christophe Fillion-Robin преди 11 години
родител
ревизия
e7f6c03a51
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2 2
      Applications/ctkDICOM2/Testing/Cpp/CMakeLists.txt
  2. 1 1
      Applications/ctkDICOM2/Testing/Cpp/ctkDICOMTest1.cpp

+ 2 - 2
Applications/ctkDICOM2/Testing/Cpp/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(KIT ${PROJECT_NAME})
 set(KIT ${PROJECT_NAME})
 
 
 create_test_sourcelist(Tests ${KIT}CppTests.cpp
 create_test_sourcelist(Tests ${KIT}CppTests.cpp
-  ctkDICOMTest1.cpp
+  ctkDICOM2Test1.cpp
   )
   )
 
 
 SET (TestsToRun ${Tests})
 SET (TestsToRun ${Tests})
@@ -18,4 +18,4 @@ target_link_libraries(${KIT}CppTests ${KIT_target_libraries})
 # Add Tests
 # Add Tests
 #
 #
 
 
-SIMPLE_TEST(ctkDICOMTest1 $<TARGET_FILE:ctkDICOM>)
+SIMPLE_TEST(ctkDICOM2Test1 $<TARGET_FILE:ctkDICOM2>)

+ 1 - 1
Applications/ctkDICOM2/Testing/Cpp/ctkDICOMTest1.cpp

@@ -26,7 +26,7 @@
 #include <cstdlib>
 #include <cstdlib>
 #include <iostream>
 #include <iostream>
 
 
-int ctkDICOMTest1(int argc, char * argv [])
+int ctkDICOM2Test1(int argc, char * argv [])
 {
 {
   QCoreApplication app(argc, argv);
   QCoreApplication app(argc, argv);
   if (app.arguments().count() != 2)
   if (app.arguments().count() != 2)