Changeset 331 in pacpusframework
- Timestamp:
- 12/04/14 12:33:07 (10 years ago)
- Files:
-
- 18 added
- 16 deleted
- 7 edited
-
branches/0.1.x/src/DBITEPlayer/CMakeLists.txt (modified) (2 diffs)
-
branches/0.1.x/src/PacpusSensor/CMakeLists.txt (modified) (7 diffs)
-
branches/0.1.x/src/dbcDecriptor/CMakeLists.txt (modified) (3 diffs)
-
branches/0.1.x/src/dbcDecriptor/dbcDecriptor.pro (deleted)
-
branches/0.1.x/src/dbcDecriptor/dbcDecriptor.rc (deleted)
-
branches/0.1.x/src/dbcDecriptor/heudiasyc.ico (deleted)
-
branches/0.1.x/src/dbcDecriptor/main.cpp (deleted)
-
branches/0.1.x/src/dbcDecriptor/mainwindow.cpp (deleted)
-
branches/0.1.x/src/dbcDecriptor/mainwindow.h (deleted)
-
branches/0.1.x/src/dbcDecriptor/mainwindow.ui (deleted)
-
branches/0.1.x/src/dbcDecriptor/src (added)
-
branches/0.1.x/src/dbcDecriptor/src/main.cpp (added)
-
branches/0.1.x/src/dbcDecriptor/src/mainwindow.cpp (added)
-
branches/0.1.x/src/dbcDecriptor/src/mainwindow.h (added)
-
branches/0.1.x/src/dbcDecriptor/src/mainwindow.ui (added)
-
branches/0.1.x/src/dbcDecriptor/src/structure.h (added)
-
branches/0.1.x/src/dbcDecriptor/structure.h (deleted)
-
branches/0.1.x/src/ico (added)
-
branches/0.1.x/src/ico/heudiasyc.ico (added)
-
branches/0.1.x/src/ico/heudiasycIco.rc (added)
-
trunk/src/DBITEPlayer/CMakeLists.txt (modified) (2 diffs)
-
trunk/src/PacpusSensor/CMakeLists.txt (modified) (7 diffs)
-
trunk/src/PacpusSensor/src/ui/pacpusmainwindow.h (modified) (1 diff)
-
trunk/src/dbcDecriptor/CMakeLists.txt (modified) (3 diffs)
-
trunk/src/dbcDecriptor/dbcDecriptor.pro (deleted)
-
trunk/src/dbcDecriptor/dbcDecriptor.rc (deleted)
-
trunk/src/dbcDecriptor/heudiasyc.ico (deleted)
-
trunk/src/dbcDecriptor/main.cpp (deleted)
-
trunk/src/dbcDecriptor/mainwindow.cpp (deleted)
-
trunk/src/dbcDecriptor/mainwindow.h (deleted)
-
trunk/src/dbcDecriptor/mainwindow.ui (deleted)
-
trunk/src/dbcDecriptor/src (added)
-
trunk/src/dbcDecriptor/src/main.cpp (added)
-
trunk/src/dbcDecriptor/src/mainwindow.cpp (added)
-
trunk/src/dbcDecriptor/src/mainwindow.h (added)
-
trunk/src/dbcDecriptor/src/mainwindow.ui (added)
-
trunk/src/dbcDecriptor/src/structure.h (added)
-
trunk/src/dbcDecriptor/structure.h (deleted)
-
trunk/src/ico (added)
-
trunk/src/ico/heudiasyc.ico (added)
-
trunk/src/ico/heudiasycIco.rc (added)
Legend:
- Unmodified
- Added
- Removed
-
branches/0.1.x/src/DBITEPlayer/CMakeLists.txt
r163 r331 38 38 set(PROJECT_HDRS 39 39 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h 40 ${PACPUS_INCLUDE_DIR}/Pacpus/ /kernel/ComponentBase.h40 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentBase.h 41 41 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h 42 42 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h … … 63 63 ${PROJECT_NAME} 64 64 ./src/main.cpp 65 ../ico/heudiasycIco.rc 65 66 ) 66 67 -
branches/0.1.x/src/PacpusSensor/CMakeLists.txt
r151 r331 13 13 # ======================================== 14 14 add_definitions( 15 15 ${QT_DEFINITIONS} 16 16 ) 17 17 … … 20 20 # ======================================== 21 21 include_directories( 22 23 22 ${PROJECT_BINARY_DIR} 23 ${QT_INCLUDE_DIR} 24 24 ) 25 25 # ======================================== … … 27 27 # ======================================== 28 28 link_directories( 29 30 29 ${PROJECT_BINARY_DIR}/../PacpusLib 30 ${PROJECT_BINARY_DIR}/../FileLib 31 31 ${PROJECT_BINARY_DIR}/../RoadTime 32 32 ) … … 36 36 # ======================================== 37 37 set( 38 39 40 41 38 PROJECT_SRCS 39 src/ui/pacpusmainwindow.cpp 40 src/ui/pacpusmainwindow.h 41 src/main.cpp 42 42 ) 43 43 … … 51 51 qt_wrap_cpp(SENSOR_MOC_SOURCES ${SENSOR_MOC_CLASSES}) 52 52 53 source_group(Main_ui FILES ${PROJECT_SRCS} 54 source_group(moc FILES ${SENSOR_MOC_SOURCES} ${SENSOR_UI_SOURCES_H} 53 source_group(Main_ui FILES ${PROJECT_SRCS}) 54 source_group(moc FILES ${SENSOR_MOC_SOURCES} ${SENSOR_UI_SOURCES_H}) 55 55 56 56 # ======================================== … … 58 58 # ======================================== 59 59 pacpus_add_executable( 60 ${PROJECT_NAME} 61 ./src/main.cpp 62 ./src/ui/pacpusmainwindow.cpp 63 ./src/ui/pacpusmainwindow.h 64 ${SENSOR_MOC_SOURCES} 65 ${SENSOR_UI_CLASSES} 60 ${PROJECT_NAME} 61 ./src/main.cpp 62 ./src/ui/pacpusmainwindow.cpp 63 ./src/ui/pacpusmainwindow.h 64 ../ico/heudiasycIco.rc 65 ${SENSOR_MOC_SOURCES} 66 ${SENSOR_UI_CLASSES} 66 67 ) 67 68 … … 71 72 72 73 set(OPT_LIBRARIES 73 74 74 optimized FileLib debug FileLib_d 75 optimized PacpusLib debug PacpusLib_d 75 76 ) 76 77 77 78 # Windows platform 78 79 if(WIN32) 79 80 81 80 LIST(APPEND OPT_LIBRARIES 81 optimized ROAD_TIME debug ROAD_TIME_d 82 Winmm 82 83 ) 83 84 endif() 84 85 85 86 if(UNIX) 86 87 88 87 LIST(APPEND OPT_LIBRARIES 88 pthread 89 ) 89 90 endif() 90 91 91 92 # All the platform 92 93 target_link_libraries( 93 94 95 96 94 ${PROJECT_NAME} 95 ${PACPUS_DEPENDENCIES_LIB} 96 ${OPT_LIBRARIES} 97 ${QT_LIBRARIES} 97 98 ) 98 99 -
branches/0.1.x/src/dbcDecriptor/CMakeLists.txt
r328 r331 39 39 SET( 40 40 PROJECT_SRCS 41 mainwindow.cpp42 main.cpp43 mainwindow.h44 s tructure.h45 dbcDecriptor.rc41 src/mainwindow.cpp 42 src/main.cpp 43 src/mainwindow.h 44 src/structure.h 45 ../ico/heudiasycIco.rc 46 46 ) 47 47 … … 51 51 SET( 52 52 FILES_TO_MOC 53 mainwindow.h53 src/mainwindow.h 54 54 ) 55 55 56 56 SET( 57 57 UI_FILES 58 mainwindow.ui58 src/mainwindow.ui 59 59 ) 60 60 … … 72 72 ) 73 73 74 ADD_EXECUTABLE(${PROJECT_NAME} ${GUI_TYPE} ${PROJECT_SRCS} ${PROJECT_MOC_SRCS} ${PROJECT_UI_SRCS}) 75 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${QT_LIBRARIES}) 74 # ======================================== 75 # Build an executable 76 # ======================================== 77 pacpus_add_executable( 78 ${PROJECT_NAME} 79 ${GUI_TYPE} 80 ${PROJECT_SRCS} 81 ${PROJECT_MOC_SRCS} 82 ${PROJECT_UI_SRCS} 83 ) 84 85 # ======================================== 86 # Libraries 87 # ======================================== 88 TARGET_LINK_LIBRARIES( 89 ${PROJECT_NAME} 90 ${QT_LIBRARIES} 91 ) 76 92 77 93 # ======================================== -
trunk/src/DBITEPlayer/CMakeLists.txt
r163 r331 38 38 set(PROJECT_HDRS 39 39 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h 40 ${PACPUS_INCLUDE_DIR}/Pacpus/ /kernel/ComponentBase.h40 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentBase.h 41 41 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h 42 42 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h … … 63 63 ${PROJECT_NAME} 64 64 ./src/main.cpp 65 ../ico/heudiasycIco.rc 65 66 ) 66 67 -
trunk/src/PacpusSensor/CMakeLists.txt
r151 r331 13 13 # ======================================== 14 14 add_definitions( 15 15 ${QT_DEFINITIONS} 16 16 ) 17 17 … … 20 20 # ======================================== 21 21 include_directories( 22 23 22 ${PROJECT_BINARY_DIR} 23 ${QT_INCLUDE_DIR} 24 24 ) 25 25 # ======================================== … … 27 27 # ======================================== 28 28 link_directories( 29 30 29 ${PROJECT_BINARY_DIR}/../PacpusLib 30 ${PROJECT_BINARY_DIR}/../FileLib 31 31 ${PROJECT_BINARY_DIR}/../RoadTime 32 32 ) … … 36 36 # ======================================== 37 37 set( 38 39 40 41 38 PROJECT_SRCS 39 src/ui/pacpusmainwindow.cpp 40 src/ui/pacpusmainwindow.h 41 src/main.cpp 42 42 ) 43 43 … … 51 51 qt_wrap_cpp(SENSOR_MOC_SOURCES ${SENSOR_MOC_CLASSES}) 52 52 53 source_group(Main_ui FILES ${PROJECT_SRCS} 54 source_group(moc FILES ${SENSOR_MOC_SOURCES} ${SENSOR_UI_SOURCES_H} 53 source_group(Main_ui FILES ${PROJECT_SRCS}) 54 source_group(moc FILES ${SENSOR_MOC_SOURCES} ${SENSOR_UI_SOURCES_H}) 55 55 56 56 # ======================================== … … 58 58 # ======================================== 59 59 pacpus_add_executable( 60 ${PROJECT_NAME} 61 ./src/main.cpp 62 ./src/ui/pacpusmainwindow.cpp 63 ./src/ui/pacpusmainwindow.h 64 ${SENSOR_MOC_SOURCES} 65 ${SENSOR_UI_CLASSES} 60 ${PROJECT_NAME} 61 ./src/main.cpp 62 ./src/ui/pacpusmainwindow.cpp 63 ./src/ui/pacpusmainwindow.h 64 ../ico/heudiasycIco.rc 65 ${SENSOR_MOC_SOURCES} 66 ${SENSOR_UI_CLASSES} 66 67 ) 67 68 … … 71 72 72 73 set(OPT_LIBRARIES 73 74 74 optimized FileLib debug FileLib_d 75 optimized PacpusLib debug PacpusLib_d 75 76 ) 76 77 77 78 # Windows platform 78 79 if(WIN32) 79 80 81 80 LIST(APPEND OPT_LIBRARIES 81 optimized ROAD_TIME debug ROAD_TIME_d 82 Winmm 82 83 ) 83 84 endif() 84 85 85 86 if(UNIX) 86 87 88 87 LIST(APPEND OPT_LIBRARIES 88 pthread 89 ) 89 90 endif() 90 91 91 92 # All the platform 92 93 target_link_libraries( 93 94 95 96 94 ${PROJECT_NAME} 95 ${PACPUS_DEPENDENCIES_LIB} 96 ${OPT_LIBRARIES} 97 ${QT_LIBRARIES} 97 98 ) 98 99 -
trunk/src/PacpusSensor/src/ui/pacpusmainwindow.h
r288 r331 36 36 public: 37 37 /// @todo Documentation 38 ComponentCheckBox( QString const& text, QWidget * parent, const char * /*name*/ = 0 )38 ComponentCheckBox(const QString & text, QWidget * parent, const char * /*name*/ = 0 ) 39 39 : QCheckBox(text, parent) 40 40 { -
trunk/src/dbcDecriptor/CMakeLists.txt
r329 r331 39 39 SET( 40 40 PROJECT_SRCS 41 mainwindow.cpp42 main.cpp43 mainwindow.h44 s tructure.h45 dbcDecriptor.rc41 src/mainwindow.cpp 42 src/main.cpp 43 src/mainwindow.h 44 src/structure.h 45 ../ico/heudiasycIco.rc 46 46 ) 47 47 … … 51 51 SET( 52 52 FILES_TO_MOC 53 mainwindow.h53 src/mainwindow.h 54 54 ) 55 55 56 56 SET( 57 57 UI_FILES 58 mainwindow.ui58 src/mainwindow.ui 59 59 ) 60 60 … … 72 72 ) 73 73 74 ADD_EXECUTABLE(${PROJECT_NAME} ${GUI_TYPE} ${PROJECT_SRCS} ${PROJECT_MOC_SRCS} ${PROJECT_UI_SRCS}) 75 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${QT_LIBRARIES}) 74 # ======================================== 75 # Build an executable 76 # ======================================== 77 pacpus_add_executable( 78 ${PROJECT_NAME} 79 ${GUI_TYPE} 80 ${PROJECT_SRCS} 81 ${PROJECT_MOC_SRCS} 82 ${PROJECT_UI_SRCS} 83 ) 84 85 # ======================================== 86 # Libraries 87 # ======================================== 88 TARGET_LINK_LIBRARIES( 89 ${PROJECT_NAME} 90 ${QT_LIBRARIES} 91 ) 76 92 77 93 # ========================================
Note:
See TracChangeset
for help on using the changeset viewer.
