Changeset 120 in pacpusframework for branches/2.0-beta1/cmake

Timestamp:

Jul 15, 2013, 4:59:37 PM (11 years ago)

Author:

morasjul

Message:

• add PacpusSerialport (QT 5.1 required)
• add part of QT4 / QT5 cmake script
• fix CMake (link)
• add ComponentBase virtual function addInput() & addOutput() call before component configuration

Location:

branches/2.0-beta1/cmake

Files:

• PacpusDependencies.cmake (modified) (4 diffs)
• PacpusUtilities.cmake (modified) (2 diffs)

branches/2.0-beta1/cmake/PacpusDependencies.cmake

@@ -42 +42 @@
 find_package(Qt5OpenGL REQUIRED)
 find_package(Qt5Network REQUIRED)
+find_package(Qt5SerialPort REQUIRED)
 
 set(QT_DEFINITIONS
@@ -50 +51 @@
 ${Qt5OpenGL_DEFINITIONS}
 ${Qt5Network_DEFINITIONS}
+${Qt5SerialPort_DEFINITIONS}
 )
 set(QT_INCLUDE_DIR
@@ -58 +60 @@
 ${Qt5OpenGL_INCLUDE_DIRS}
 ${Qt5Network_INCLUDE_DIRS}
+${Qt5SerialPort_INCLUDE_DIRS}
 )
 
@@ -67 +70 @@
 ${Qt5OpenGL_LIBRARIES}
 ${Qt5Network_LIBRARIES}
+${Qt5SerialPort_LIBRARIES}
 )
 

branches/2.0-beta1/cmake/PacpusUtilities.cmake

@@ -8 +8 @@
 #################################################
 
-# ========================================
-# Create a Pacpus plugin
+
+# TODO  Compatibility macro
+## ========================================
+## Qt macro compatibility Qt4 / Qt5
+## ========================================
+#function(qt_wrap_moc MOC_SRCS FILES_TO_MOC)
+
+#    if(QT4_FOUNDED)
+#        qt4_wrap_cpp(TEMP_VAR ${FILES_TO_MOC})
+
+#    elseif(Qt5Core_FOUND)
+#        qt5_wrap_cpp(${MOC_SRCS} ${FILES_TO_MOC} PARENT_SCOPE)
+
+#    else()
+#        message(WARNING "QT ui found, can't wrap moc File")
+#    endif()
+
+#    #set(${MOC_SRCS} ${TEMP_VAR} PARENT_SCOPE)
+
+#endfunction(qt_wrap_moc)
+
+## ========================================
+## Qt macro compatibility Qt4 / Qt5
+## ========================================
+#function(qt_wrap_ui UI_SRCS UI_FILES)
+#    if(QT4_FOUND)
+#        qt4_wrap_ui( TEMP_VAR ${UI_FILES})
+
+#    elseif(Qt5Core_FOUND)
+#        qt5_wrap_ui( TEMP_VAR ${UI_FILES})
+
+#    else()
+#        message(WARNING "QT ui found, can't wrap ui File")
+#    endif()
+
+#    set(${UI_SRCS} ${TEMP_VAR} PARENT_SCOPE)
+#endfunction()
+
+# ========================================
+# Generic macro for Pacpus plugin
 # ========================================
 function(PACPUS_PLUGIN OUT_CPP OUT_H PLUGIN_NAME)
+
+    if(QT4_FOUND)
+        pacpus_plugin_qt4(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
+
+    elseif(Qt5Core_FOUND)
+        pacpus_plugin_qt5(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
+
+    else()
+        message(WARNING "QT not found, can't create Plugin")
+    endif()
+
+
+endfunction(PACPUS_PLUGIN)
+
+# ========================================
+# Create a Pacpus plugin QT4
+# ========================================
+function(PACPUS_PLUGIN_QT4 OUT_CPP OUT_H PLUGIN_NAME)
+
+    set(PLUGIN_NAME ${PLUGIN_NAME}Plugin)
+    set(${OUT_CPP} ${PLUGIN_NAME}.cpp PARENT_SCOPE)
+    set(${OUT_H} ${PLUGIN_NAME}.h PARENT_SCOPE)
+
+    string(TOUPPER ${PLUGIN_NAME} PLUGIN_NAME_UPPER)
+
+    # create the header file
+    file(WRITE ${PLUGIN_NAME}.h
+        "// Autogenerated file by PacpusPlugin.cmake\n"
+        "// DO NOT EDIT!!! ALL CHANGES WOULD BE REMOVED BY THE NEXT CALL OF CMAKE\n"
+        "\n"
+        "#ifndef __${PLUGIN_NAME_UPPER}_H__\n"
+        "#define __${PLUGIN_NAME_UPPER}_H__\n"
+        "\n"
+        "#include <QObject>\n"
+        "#include <qplugin.h>\n"
+        "\n"
+        "#include <Pacpus/kernel/PacpusPluginInterface.h>\n"
+        "\n"
+        "/// Auto-generated plugin class\n"
+        "class ${PLUGIN_NAME}\n"
+        "    : public QObject\n"
+        "    , public PacpusPluginInterface\n"
+        "{\n"
+        "    Q_OBJECT\n"
+        "    Q_INTERFACES(PacpusPluginInterface)\n"
+        "\n"
+        "public:\n"
+        "    ${PLUGIN_NAME}();\n"
+        "    ~${PLUGIN_NAME}();\n"
+        "\n"
+        "protected:\n"
+        "    QString name();\n"
+        "};\n"
+        "\n"
+        "#endif // __${PLUGIN_NAME_UPPER}_H__\n"
+    )
+
+    # create the cpp file
+    file(WRITE ${PLUGIN_NAME}.cpp
+        "// Autogenerated file by PacpusPlugin.cmake\n"
+        "// DO NOT EDIT!!! ALL CHANGES WOULD BE REMOVED BY THE NEXT CALL OF CMAKE\n"
+        "\n"
+        "#include \"${PLUGIN_NAME}.h\"\n"
+        "\n"
+        "${PLUGIN_NAME}::${PLUGIN_NAME}()\n"
+        "{\n"
+        "}\n"
+        "\n"
+        "${PLUGIN_NAME}::~${PLUGIN_NAME}()\n"
+        "{\n"
+        "}\n"
+        "\n"
+        "QString ${PLUGIN_NAME}::name()\n"
+        "{\n"
+        "    return \"${PLUGIN_NAME}\";\n"
+        "}\n"
+        "\n"
+        "Q_EXPORT_PLUGIN2(${PLUGIN_NAME}, ${PLUGIN_NAME})\n"
+    )
+endfunction(PACPUS_PLUGIN_QT4)
+
+# ========================================
+# Create a Pacpus plugin QT5
+# ========================================
+function(PACPUS_PLUGIN_QT5 OUT_CPP OUT_H PLUGIN_NAME)
 
     set(PLUGIN_NAME ${PLUGIN_NAME}Plugin)
@@ -82 +205 @@
         "}\n"
         )
-endfunction(PACPUS_PLUGIN)
+endfunction(PACPUS_PLUGIN_QT5)
 
 # ========================================