Prechádzať zdrojové kódy

ENH: fixed Qt Resource handling

Sascha Zelzer 15 rokov pred
rodič
commit
84576286df
1 zmenil súbory, kde vykonal 4 pridanie a 4 odobranie
  1. 4 4
      CMake/ctkMacroBuildQtPlugin.cmake

+ 4 - 4
CMake/ctkMacroBuildQtPlugin.cmake

@@ -4,7 +4,7 @@
 #
 MACRO(ctkMacroBuildQtPlugin)
   CtkMacroParseArguments(MY
-    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;UI_RESOURCES;LIBRARY_TYPE"
+    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;UI_RESOURCES;QRC_FILES;LIBRARY_TYPE"
     ""
     ${ARGN}
     )
@@ -49,9 +49,9 @@ MACRO(ctkMacroBuildQtPlugin)
   QT4_WRAP_CPP(MY_SRCS ${MY_MOC_SRCS})
   QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
   SET(MY_QRC_SRCS "")
-  IF(DEFINED MY_UI_RESOURCES)
-    QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_UI_RESOURCES})
-  ENDIF(DEFINED MY_UI_RESOURCES)
+  IF(DEFINED MY_QRC_FILES)
+    QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_QRC_FILES})
+  ENDIF(DEFINED MY_QRC_FILES)
 
   SOURCE_GROUP("Resources" FILES
     ${MY_UI_RESOURCES}