Changeset 119 in pacpusframework
- Timestamp:
- Jun 28, 2013, 4:56:24 PM (11 years ago)
- Location:
- branches/2.0-beta1
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.0-beta1/cmake/PacpusConfiguration.cmake
r89 r119 24 24 set(PACPUS_USE_SOLUTION_FOLDERS FALSE CACHE BOOL "Use solution folders to classify projects, works in MS Visual Studio") 25 25 26 set(QT5 FALSE CACHE BOOL " Use Qt5 or Qt4") 27 26 28 if(PACPUS_USE_SOLUTION_FOLDERS) 27 29 if(CMAKE_VERSION VERSION_GREATER "2.8.0") -
branches/2.0-beta1/cmake/PacpusDependencies.cmake
r92 r119 14 14 set(PACPUS_DEPENDENCIES_INC "") 15 15 set(PACPUS_DEPENDENCIES_LIB "") 16 17 if(NOT QT5) 18 find_package(Qt4) 19 if(NOT QT4_FOUND) 20 message(WARNING "Qt4 not found try to find Qt5") 21 set(QT5 TRUE) 22 endif() 23 endif() 24 25 if(QT5) 16 26 17 27 # ======================================== … … 63 73 endif() 64 74 75 else(QT5) 76 77 # ======================================== 78 # All the Pacpus' modules depends from Qt4 79 # However, since each module requires specific Qt's modules, they have to include their own QT_USE_FILE 80 # ======================================== 81 find_package(Qt4 REQUIRED) 82 83 endif(QT5) 84 65 85 # ======================================== 66 86 # Boost -
branches/2.0-beta1/include/Pacpus/kernel/inputOutputInterface.h
r110 r119 44 44 45 45 qDebug() << "Revever " << getSignature() << " thread " << QThread::currentThread() << " Data & " << & typedEvent->data_; 46 47 //if(_component) get state 46 48 47 49 if(typedEvent->tr_ < 500 && readingMode_ == TimeBounded) { -
branches/2.0-beta1/src/PacpusTools/CMakeLists.txt
r111 r119 40 40 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h 41 41 #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/pacpusStruct.h 42 #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/ QSerialPort.h42 #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h 43 43 ./src/matrice.cpp 44 44 ./src/geodesie.cpp 45 45 ./src/AsyncWorkerBase.cpp 46 46 ./src/PeriodicWorker.cpp 47 #./src/ QSerialPort.cpp47 #./src/PacpusSerialPort.cpp 48 48 ) 49 49 … … 55 55 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h 56 56 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h 57 #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/ QSerialPort.h57 #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h 58 58 ) 59 59
Note:
See TracChangeset
for help on using the changeset viewer.