Changeset 120 in pacpusframework for branches/2.0-beta1/src/PacpusSensor

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

File:

• branches/2.0-beta1/src/PacpusSensor/CMakeLists.txt (modified) (4 diffs)

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

@@ -29 +29 @@
     ${PROJECT_BINARY_DIR}/../PacpusLib
     ${PROJECT_BINARY_DIR}/../FileLib
+    ${PROJECT_BINARY_DIR}/../PacpusTools
 )
 
@@ -46 +47 @@
 set(SENSOR_UI_CLASSES src/ui/pacpusmainwindow.ui)
 set(SENSOR_MOC_CLASSES src/ui/pacpusmainwindow.h)
+
 qt5_wrap_ui(SENSOR_UI_SOURCES_H ${SENSOR_UI_CLASSES})
 qt5_wrap_cpp(SENSOR_MOC_SOURCES ${SENSOR_MOC_CLASSES})
+
 source_group(Main_ui FILES ${PROJECT_SRCS} )
 source_group(moc FILES ${SENSOR_MOC_SOURCES} ${SENSOR_UI_SOURCES_H} )
@@ -66 +69 @@
 # Libraries
 # ========================================
+
+set(OPT_LIBRARIES
+        optimized FileLib debug FileLib_d
+        optimized PacpusLib debug PacpusLib_d
+        optimized PacpusTools debug PacpusTools_d
+)
+
 # Windows platform
 if(WIN32)
-set(LIBS
+    LIST(APPEND OPT_LIBRARIES
         optimized ROAD_TIME debug ROAD_TIME_d
         Winmm
@@ -78 +88 @@
     ${PROJECT_NAME}
     ${PACPUS_DEPENDENCIES_LIB}
-    optimized FileLib debug FileLib_d
-    optimized PacpusLib debug PacpusLib_d
-    ${LIBS}
+    ${OPT_LIBRARIES}
     ${QT_LIBRARIES}
 )