Changeset 139 in pacpusframework

Timestamp:

07/30/13 16:47:01 (11 years ago)

Author:

Marek Kurdej

Message:

Fixed: qt_wrap_ui, qt_wrap_moc compatibility macros for Qt4/Qt5.
Added: qt_add_resources.

File:

• branches/2.0-beta1/cmake/PacpusUtilities.cmake (modified) (4 diffs)

branches/2.0-beta1/cmake/PacpusUtilities.cmake

@@ -11 +11 @@
 ## Qt macro compatibility Qt4 / Qt5
 ## ========================================
-function(qt_wrap_cpp OUT_MOC_SRCS FILES_TO_MOC)
+function(qt_wrap_cpp OUT_MOC_SRCS)
+    set(FILES_TO_MOC ${ARGN})
     if(QT4_FOUND)
         qt4_wrap_cpp(MOC_SRCS ${FILES_TO_MOC})
@@ -17 +18 @@
         qt5_wrap_cpp(MOC_SRCS ${FILES_TO_MOC})
     else()
-        message(WARNING "QT not found, can't wrap moc File")
+        message(WARNING "QT not found, cannot wrap moc files")
     endif()
 
@@ -26 +27 @@
 ## Qt macro compatibility Qt4 / Qt5
 ## ========================================
-function(qt_wrap_ui OUT_UI_SRCS UI_FILES)
+function(qt_wrap_ui OUT_UI_SRCS)
+    set(UI_FILES ${ARGN})
     if(QT4_FOUND)
         qt4_wrap_ui( UI_SRCS ${UI_FILES})
@@ -32 +34 @@
         qt5_wrap_ui( UI_SRCS ${UI_FILES})
     else()
-        message(WARNING "QT not found, can't wrap ui File")
+        message(WARNING "QT not found, cannot wrap ui files")
     endif()
 
     set(${OUT_UI_SRCS} ${UI_SRCS} PARENT_SCOPE)
+endfunction()
+
+## ========================================
+## Qt macro compatibility Qt4 / Qt5
+## ========================================
+function(qt_add_resources OUT_RESOURCES)
+    set(RCS_FILES ${ARGN})
+    if(QT4_FOUND)
+        qt4_add_resources( RESOURCES ${RCS_FILES})
+    elseif(Qt5Core_FOUND)
+        qt5_add_resources( RESOURCES ${RCS_FILES})
+    else()
+        message(WARNING "QT not found, cannot add resources")
+    endif()
+
+    set(${OUT_RESOURCES} ${RESOURCES} PARENT_SCOPE)
 endfunction()