Selaa lähdekoodia

COMP: Add XMLDescription.xsd in Testing project configurations

The resource XMLDescription.xsd is required by ctkXMLEventSource.
Julien Finet 13 vuotta sitten
vanhempi
commit
9651209a61

+ 4 - 2
Libs/QtTesting/CMake/ctkQtTesting.cmake

@@ -1,5 +1,5 @@
 
-macro(ctkQtTesting SRCS_OUTPUT_VAR MOC_CPP_OUTPUT_VAR UI_FORMS_OUTPUT_VAR)
+macro(ctkQtTesting SRCS_OUTPUT_VAR MOC_CPP_OUTPUT_VAR UI_FORMS_OUTPUT_VAR RESOURCES_OUTPUT_VAR)
   # Do not export symbol in ctkEventTranslatorPlayerWidget class
   add_definitions(-DNO_SYMBOL_EXPORT)
 
@@ -24,5 +24,7 @@ macro(ctkQtTesting SRCS_OUTPUT_VAR MOC_CPP_OUTPUT_VAR UI_FORMS_OUTPUT_VAR)
   list(APPEND ${UI_FORMS_OUTPUT_VAR}
     ${CTK_SOURCE_DIR}/Libs/QtTesting/Resources/UI/ctkEventTranslatorPlayerWidget.ui
     )
-
+  list(APPEND ${RESOURCES_OUTPUT_VAR}
+    ${CTK_SOURCE_DIR}/Libs/QtTesting/Resources/ctkQtTesting.qrc
+    )
 endmacro()

+ 4 - 2
Libs/Visualization/VTK/Widgets/Testing/Cpp/CMakeLists.txt

@@ -86,7 +86,7 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 # If CTK_USE_QTTESTING is ON
 #
 if(CTK_USE_QTTESTING)
-  ctkQtTesting(Tests TEST_MOC_SOURCES TEST_UI_FORMS)
+  ctkQtTesting(Tests TEST_MOC_SOURCES TEST_UI_FORMS Tests_RESOURCES)
 endif()
 
 set(TEST_MOC_CPP)
@@ -97,8 +97,10 @@ set(TEST_UI_CPP)
 if(TEST_UI_FORMS)
   QT4_WRAP_UI(TEST_UI_CPP ${TEST_UI_FORMS})
 endif()
+set(Tests_RESOURCES_SRCS)
+QT4_ADD_RESOURCES(Tests_RESOURCES_SRCS ${Tests_RESOURCES})
 
-add_executable(${KIT}CppTests ${Tests} ${TEST_MOC_CPP} ${TEST_UI_CPP})
+add_executable(${KIT}CppTests ${Tests} ${TEST_MOC_CPP} ${TEST_UI_CPP} ${Tests_RESOURCES_SRCS})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} vtkCharts ${CTK_BASE_LIBRARIES})
 
 #

+ 4 - 2
Libs/Widgets/Testing/Cpp/CMakeLists.txt

@@ -164,7 +164,7 @@ set(Tests_MOC_SRCS
   )
 
 if(CTK_USE_QTTESTING)
-  ctkQtTesting(Tests_SRCS Tests_MOC_SRCS Tests_UI_FORMS)
+  ctkQtTesting(Tests_SRCS Tests_MOC_SRCS Tests_UI_FORMS Tests_RESOURCES)
 endif()
 
 set(Tests_MOC_CPP)
@@ -178,8 +178,10 @@ set(Tests_UI_CPP)
 if(TEST_UI_FORMS)
   QT4_WRAP_UI(Tests_UI_CPP ${Tests_UI_FORMS})
 endif()
+set(Tests_RESOURCES_SRCS)
+QT4_ADD_RESOURCES(Tests_RESOURCES_SRCS ${Tests_RESOURCES})
 
-add_executable(${KIT}CppTests ${Tests} ${Tests_SRCS} ${Tests_MOC_CPP} ${Tests_UI_CPP})
+add_executable(${KIT}CppTests ${Tests} ${Tests_SRCS} ${Tests_MOC_CPP} ${Tests_UI_CPP} ${Tests_RESOURCES_SRCS})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
 
 #