Procházet zdrojové kódy

Order filenames in CMakeLists alphabetically

Julien Finet před 14 roky
rodič
revize
f2fa57ea6a

+ 6 - 6
Libs/DICOM/Core/CMakeLists.txt

@@ -9,10 +9,14 @@ SET(KIT_export_directive "CTK_DICOM_CORE_EXPORT")
   
 # Source files
 SET(KIT_SRCS
+  ctkDICOMAbstractThumbnailGenerator.cpp
+  ctkDICOMAbstractThumbnailGenerator.h
   ctkDICOMDatabase.cpp
   ctkDICOMDatabase.h
   ctkDICOMDataset.cpp
   ctkDICOMDataset.h
+  ctkDICOMFilterProxyModel.cpp
+  ctkDICOMFilterProxyModel.h
   ctkDICOMIndexer.cpp
   ctkDICOMIndexer.h
   ctkDICOMModel.cpp
@@ -25,10 +29,6 @@ SET(KIT_SRCS
   ctkDICOMRetrieve.h
   ctkDICOMTester.cpp
   ctkDICOMTester.h
-  ctkDICOMAbstractThumbnailGenerator.cpp
-  ctkDICOMAbstractThumbnailGenerator.h
-  ctkDICOMFilterProxyModel.cpp
-  ctkDICOMFilterProxyModel.h
 )
 
 # Abstract class should not be wrapped !
@@ -51,13 +51,13 @@ ENDIF()
 
 # Headers that should run through moc
 SET(KIT_MOC_SRCS
+  ctkDICOMAbstractThumbnailGenerator.h
   ctkDICOMDatabase.h
+  ctkDICOMFilterProxyModel.h
   ctkDICOMModel.h
   ctkDICOMQuery.h
   ctkDICOMRetrieve.h
   ctkDICOMTester.h
-  ctkDICOMAbstractThumbnailGenerator.h
-  ctkDICOMFilterProxyModel.h
   )
 
 IF(CTK_WRAP_PYTHONQT_LIGHT)

+ 3 - 3
Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt

@@ -5,9 +5,9 @@ CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
   ctkDICOMDatasetTest1.cpp
   ctkDICOMIndexerTest1.cpp
   ctkDICOMModelTest1.cpp
+  ctkDICOMPersonNameTest1.cpp
   ctkDICOMQueryTest1.cpp
   ctkDICOMQueryTest2.cpp
-  ctkDICOMPersonNameTest1.cpp
   ctkDICOMRetrieveTest1.cpp
   ctkDICOMRetrieveTest2.cpp
   ctkDICOMTest1.cpp
@@ -35,13 +35,13 @@ ENDMACRO( SIMPLE_TEST  )
 #
 SIMPLE_TEST(ctkDICOMDatabaseTest1)
 SIMPLE_TEST(ctkDICOMDatasetTest1)
-SIMPLE_TEST( ctkDICOMIndexerTest1 )
-SIMPLE_TEST( ctkDICOMPersonNameTest1)
+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})
+SIMPLE_TEST(ctkDICOMPersonNameTest1)
 
 # ctkDICOMQuery
 SIMPLE_TEST( ctkDICOMQueryTest1)

+ 21 - 21
Libs/DICOM/Widgets/CMakeLists.txt

@@ -9,32 +9,32 @@ SET(KIT_export_directive "CTK_DICOM_WIDGETS_EXPORT")
   
 # Source files
 SET(KIT_SRCS
+  ctkDICOMAppWidget.cpp
+  ctkDICOMAppWidget.h
   ctkDICOMDatasetView.cpp
   ctkDICOMDatasetView.h
   ctkDICOMDirectoryListWidget.cpp
   ctkDICOMDirectoryListWidget.h
   ctkDICOMImage.cpp
   ctkDICOMImage.h
+  ctkDICOMImportWidget.cpp
+  ctkDICOMImportWidget.h
   ctkDICOMListenerWidget.cpp
   ctkDICOMListenerWidget.h
+  ctkDICOMQueryResultsTabWidget.cpp
+  ctkDICOMQueryResultsTabWidget.h
   ctkDICOMQueryRetrieveWidget.cpp
   ctkDICOMQueryRetrieveWidget.h
-  ctkDICOMServerNodeWidget.cpp
-  ctkDICOMServerNodeWidget.h
   ctkDICOMQueryWidget.cpp
   ctkDICOMQueryWidget.h
-  ctkDICOMQueryResultsTabWidget.cpp
-  ctkDICOMQueryResultsTabWidget.h
-  ctkDICOMAppWidget.cpp
-  ctkDICOMAppWidget.h
-  ctkDICOMThumbnailWidget.cpp
-  ctkDICOMThumbnailWidget.h
-  ctkDICOMThumbnailListWidget.cpp
-  ctkDICOMThumbnailListWidget.h
-  ctkDICOMImportWidget.cpp
-  ctkDICOMImportWidget.h
+  ctkDICOMServerNodeWidget.cpp
+  ctkDICOMServerNodeWidget.h
   ctkDICOMThumbnailGenerator.cpp
   ctkDICOMThumbnailGenerator.h
+  ctkDICOMThumbnailListWidget.cpp
+  ctkDICOMThumbnailListWidget.h
+  ctkDICOMThumbnailWidget.cpp
+  ctkDICOMThumbnailWidget.h
   )
 
 IF(CTK_WRAP_PYTHONQT_LIGHT)
@@ -50,17 +50,17 @@ ENDIF()
 
 # Headers that should run through moc
 SET(KIT_MOC_SRCS
+  ctkDICOMAppWidget.h
   ctkDICOMDatasetView.h
   ctkDICOMDirectoryListWidget.h
   ctkDICOMImage.h
-  ctkDICOMServerNodeWidget.h
-  ctkDICOMAppWidget.h
-  ctkDICOMThumbnailWidget.h
-  ctkDICOMThumbnailListWidget.h
   ctkDICOMImportWidget.h
-  ctkDICOMQueryWidget.h
   ctkDICOMQueryRetrieveWidget.h
+  ctkDICOMQueryWidget.h
+  ctkDICOMServerNodeWidget.h
   ctkDICOMThumbnailGenerator.h
+  ctkDICOMThumbnailListWidget.h
+  ctkDICOMThumbnailWidget.h
   )
 
 IF(CTK_WRAP_PYTHONQT_LIGHT)
@@ -71,15 +71,15 @@ ENDIF()
 
 # UI files - includes new widgets
 SET(KIT_UI_FORMS
+  Resources/UI/ctkDICOMAppWidget.ui
   Resources/UI/ctkDICOMDirectoryListWidget.ui
+  Resources/UI/ctkDICOMImportWidget.ui
   Resources/UI/ctkDICOMListenerWidget.ui
   Resources/UI/ctkDICOMQueryRetrieveWidget.ui
-  Resources/UI/ctkDICOMServerNodeWidget.ui
   Resources/UI/ctkDICOMQueryWidget.ui
-  Resources/UI/ctkDICOMAppWidget.ui
-  Resources/UI/ctkDICOMThumbnailWidget.ui
+  Resources/UI/ctkDICOMServerNodeWidget.ui
   Resources/UI/ctkDICOMThumbnailListWidget.ui
-  Resources/UI/ctkDICOMImportWidget.ui
+  Resources/UI/ctkDICOMThumbnailWidget.ui
 )
 
 # Resources

+ 1 - 1
Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt

@@ -8,8 +8,8 @@ CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
   ctkDICOMImportWidgetTest1.cpp
   ctkDICOMListenerWidgetTest1.cpp
   ctkDICOMModelTest2.cpp
-  ctkDICOMQueryRetrieveWidgetTest1.cpp
   ctkDICOMQueryResultsTabWidgetTest1.cpp
+  ctkDICOMQueryRetrieveWidgetTest1.cpp
   ctkDICOMServerNodeWidgetTest1.cpp
   ctkDICOMThumbnailWidgetTest1.cpp
   )