Changeset 135 in pacpusframework

Timestamp:

Jul 30, 2013, 3:15:25 PM (11 years ago)

Author:

Marek Kurdej

Message:

Update: minor formatting.

File:

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

branches/2.0-beta1/cmake/PacpusUtilities.cmake

@@ -8 +8 @@
 #################################################
 
-
-# TODO  Compatibility macro
 ## ========================================
 ## Qt macro compatibility Qt4 / Qt5
 ## ========================================
 function(qt_wrap_cpp OUT_MOC_SRCS FILES_TO_MOC)
-
-    if(QT4_FOUNDED)
+    if(QT4_FOUND)
         qt4_wrap_cpp(MOC_SRCS ${FILES_TO_MOC})
-
     elseif(Qt5Core_FOUND)
         qt5_wrap_cpp(MOC_SRCS ${FILES_TO_MOC})
-
     else()
         message(WARNING "QT not found, can't wrap moc File")
@@ -26 +21 @@
 
     set(${OUT_MOC_SRCS} ${MOC_SRCS} PARENT_SCOPE)
-
 endfunction(qt_wrap_cpp)
 
@@ -35 +29 @@
     if(QT4_FOUND)
         qt4_wrap_ui( UI_SRCS ${UI_FILES})
-
     elseif(Qt5Core_FOUND)
         qt5_wrap_ui( UI_SRCS ${UI_FILES})
-
     else()
         message(WARNING "QT not found, can't wrap ui File")
@@ -44 +36 @@
 
     set(${OUT_UI_SRCS} ${UI_SRCS} PARENT_SCOPE)
-
 endfunction()
 
@@ -51 +42 @@
 # ========================================
 function(PACPUS_PLUGIN OUT_CPP OUT_H PLUGIN_NAME)
-
     if(QT4_FOUND)
         pacpus_plugin_qt4(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
-        #message("Create QT4 Plugin")
-
     elseif(Qt5Core_FOUND)
         pacpus_plugin_qt5(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
-
     else()
         message(WARNING "QT not found, can't create Plugin")
@@ -65 +52 @@
     set(${OUT_CPP} ${PLUGIN_CPP} PARENT_SCOPE)
     set(${OUT_H} ${PLUGIN_H} PARENT_SCOPE)
-
 endfunction(PACPUS_PLUGIN)
 
@@ -72 +58 @@
 # ========================================
 function(PACPUS_PLUGIN_QT4 OUT_CPP OUT_H PLUGIN_NAME)
-
     set(PLUGIN_NAME ${PLUGIN_NAME}Plugin)
     set(${OUT_CPP} ${PLUGIN_NAME}.cpp PARENT_SCOPE)
@@ -139 +124 @@
 # ========================================
 function(PACPUS_PLUGIN_QT5 OUT_CPP OUT_H PLUGIN_NAME)
-
     set(PLUGIN_NAME ${PLUGIN_NAME}Plugin)
     set(${OUT_CPP} ${PLUGIN_NAME}.cpp ${PLUGIN_NAME}.json PARENT_SCOPE)
@@ -166 +150 @@
         "    Q_OBJECT\n"
         "    //Qt5 Plugins Macro\n"
-        "    Q_PLUGIN_METADATA(IID \"papus." ${PLUGIN_NAME} "\" FILE \"" ${PLUGIN_NAME} ".json\")\n"
+        "    Q_PLUGIN_METADATA(IID \"pacpus." ${PLUGIN_NAME} "\" FILE \"" ${PLUGIN_NAME} ".json\")\n"
         "    Q_INTERFACES(PacpusPluginInterface)\n"    
         "\n"
@@ -208 +192 @@
         "    \"Keys\": [\""${PLUGIN_NAME} "\"]\n"
         "}\n"
-        )
+    )
 endfunction(PACPUS_PLUGIN_QT5)