Changeset 119 in pacpusframework for branches

Timestamp:

Jun 28, 2013, 4:56:24 PM (11 years ago)

Author:

morasjul

Message:

add Qt4 compatibility

Location:

branches/2.0-beta1

Files:

• cmake/PacpusConfiguration.cmake (modified) (1 diff)
• cmake/PacpusDependencies.cmake (modified) (2 diffs)
• include/Pacpus/kernel/inputOutputInterface.h (modified) (1 diff)
• src/PacpusTools/CMakeLists.txt (modified) (2 diffs)

branches/2.0-beta1/cmake/PacpusConfiguration.cmake

@@ -24 +24 @@
 set(PACPUS_USE_SOLUTION_FOLDERS  FALSE CACHE BOOL "Use solution folders to classify projects, works in MS Visual Studio")
 
+set(QT5      FALSE CACHE BOOL " Use Qt5 or Qt4")
+
 if(PACPUS_USE_SOLUTION_FOLDERS)
     if(CMAKE_VERSION VERSION_GREATER "2.8.0")

branches/2.0-beta1/cmake/PacpusDependencies.cmake

@@ -14 +14 @@
 set(PACPUS_DEPENDENCIES_INC "")
 set(PACPUS_DEPENDENCIES_LIB "")
+
+if(NOT QT5)
+    find_package(Qt4)
+    if(NOT QT4_FOUND)
+        message(WARNING "Qt4 not found try to find Qt5")
+        set(QT5 TRUE)
+    endif()
+endif()
+
+if(QT5)
 
 # ========================================
@@ -63 +73 @@
 endif()
 
+else(QT5)
+
+# ========================================
+# All the Pacpus' modules depends from Qt4
+# However, since each module requires specific Qt's modules, they have to include their own QT_USE_FILE
+# ========================================
+find_package(Qt4 REQUIRED)
+
+endif(QT5)
+
 # ========================================
 # Boost

branches/2.0-beta1/include/Pacpus/kernel/inputOutputInterface.h

@@ -44 +44 @@
 
             qDebug() << "Revever " << getSignature() << " thread " << QThread::currentThread() << " Data & " << & typedEvent->data_;
+
+            //if(_component) get state
 
             if(typedEvent->tr_ < 500 && readingMode_ == TimeBounded) {

branches/2.0-beta1/src/PacpusTools/CMakeLists.txt

@@ -40 +40 @@
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h
     #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/pacpusStruct.h
-    #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/QSerialPort.h
+    #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
     ./src/matrice.cpp
     ./src/geodesie.cpp
     ./src/AsyncWorkerBase.cpp
     ./src/PeriodicWorker.cpp
-    #./src/QSerialPort.cpp
+    #./src/PacpusSerialPort.cpp
 )
 
@@ -55 +55 @@
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h
-    #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/QSerialPort.h
+    #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
 )