Changeset 58 in pacpusframework
- Timestamp:
- Jan 9, 2013, 10:35:31 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
-
CMakeLists.txt (modified) (4 diffs)
-
src/CMakeLists.txt (modified) (1 diff)
-
src/DBITEPlayer/CMakeLists.txt (modified) (5 diffs)
-
src/DBITEPlayerLib/CMakeLists.txt (modified) (8 diffs)
-
src/FileLib/CMakeLists.txt (modified) (3 diffs)
-
src/PacpusLib/CMakeLists.txt (modified) (6 diffs)
-
src/PacpusSensor/CMakeLists.txt (modified) (2 diffs)
-
src/PacpusTools/CMakeLists.txt (modified) (8 diffs)
-
src/RoadTime/CMakeLists.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r52 r58 18 18 set(PACPUS_PATCH_VERSION 0) 19 19 set(PACPUS_VERSION 20 "${PACPUS_MAJOR_VERSION}.${PACPUS_MINOR_VERSION}.${PACPUS_PATCH_VERSION}")20 "${PACPUS_MAJOR_VERSION}.${PACPUS_MINOR_VERSION}.${PACPUS_PATCH_VERSION}") 21 21 22 22 # ======================================== … … 76 76 # Build the documentation if enabled 77 77 # ======================================== 78 if 78 if(PACPUS_BUILD_DOC) 79 79 add_subdirectory(${PACPUS_DOC_DIR}) 80 80 endif() … … 95 95 pacpus_info(" Platform:") 96 96 pacpus_info(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR}) 97 if 97 if(CMAKE_CROSS_COMPILING) 98 98 pacpus_info(" Target:" ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}) 99 99 endif() … … 101 101 pacpus_info(" CMake generator:" ${CMAKE_GENERATOR}) 102 102 pacpus_info(" CMake build tool:" ${CMAKE_BUILD_TOOL}) 103 if 103 if(MSVC) 104 104 pacpus_info(" MSVC:" ${MSVC_VERSION}) 105 105 else() -
trunk/src/CMakeLists.txt
r3 r58 10 10 # Libraries, windows 11 11 # ======================================== 12 if 13 add_subdirectory(RoadTime)12 if(WIN32) 13 add_subdirectory(RoadTime) 14 14 endif() 15 15 -
trunk/src/DBITEPlayer/CMakeLists.txt
r28 r58 24 24 # ======================================== 25 25 add_definitions( 26 ${QT_DEFINITIONS}26 ${QT_DEFINITIONS} 27 27 ) 28 28 … … 31 31 # ======================================== 32 32 include_directories( 33 ${CMAKE_BINARY_DIR}/DBITEPlayer34 ${QT_INCLUDE_DIR}33 ${CMAKE_BINARY_DIR}/DBITEPlayer 34 ${QT_INCLUDE_DIR} 35 35 ) 36 36 … … 39 39 # ======================================== 40 40 set( 41 PROJECT_SRCS42 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h43 ${PACPUS_INCLUDE_DIR}/Pacpus//kernel/ComponentBase.h44 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h45 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h46 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentManager.h47 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/Log.h48 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpus.h49 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h50 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlComponentConfig.h51 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlConfigFile.h52 ./ComponentBase.cpp53 ./ComponentFactoryBase.cpp54 ./ComponentManager.cpp55 ./Log.cpp56 ./XmlComponentConfig.cpp57 ./XmlConfigFile.cpp41 PROJECT_SRCS 42 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h 43 ${PACPUS_INCLUDE_DIR}/Pacpus//kernel/ComponentBase.h 44 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h 45 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h 46 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentManager.h 47 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/Log.h 48 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpus.h 49 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h 50 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlComponentConfig.h 51 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlConfigFile.h 52 ./ComponentBase.cpp 53 ./ComponentFactoryBase.cpp 54 ./ComponentManager.cpp 55 ./Log.cpp 56 ./XmlComponentConfig.cpp 57 ./XmlConfigFile.cpp 58 58 ) 59 59 … … 62 62 # ======================================== 63 63 pacpus_add_executable( 64 ${PROJECT_NAME}65 ./src/main.cpp64 ${PROJECT_NAME} 65 ./src/main.cpp 66 66 ) 67 67 … … 71 71 # All the platform 72 72 target_link_libraries( 73 ${PROJECT_NAME}74 ${QT_LIBRARIES}75 dbiteplayerlib76 FileLib77 PacpusLib78 PacpusTools73 ${PROJECT_NAME} 74 ${QT_LIBRARIES} 75 dbiteplayerlib 76 FileLib 77 PacpusLib 78 PacpusTools 79 79 ) 80 80 # Windows 81 if 82 target_link_libraries(83 ${PROJECT_NAME}84 ROAD_TIME85 Winmm86 )81 if(WIN32) 82 target_link_libraries( 83 ${PROJECT_NAME} 84 ROAD_TIME 85 Winmm 86 ) 87 87 endif() 88 88 -
trunk/src/DBITEPlayerLib/CMakeLists.txt
r28 r58 13 13 # ======================================== 14 14 if(QT4_FOUND) 15 set(QT_USE_QTXML true)16 set(QT_USE_QTNETWORK TRUE)17 include(${QT_USE_FILE})15 set(QT_USE_QTXML true) 16 set(QT_USE_QTNETWORK TRUE) 17 include(${QT_USE_FILE}) 18 18 else() 19 message(ERROR "Qt4 needed")19 message(ERROR "Qt4 needed") 20 20 endif(QT4_FOUND) 21 21 … … 24 24 # ======================================== 25 25 add_definitions( 26 -DDBITE_PLAYER_EXPORTS27 ${QT_DEFINITIONS}26 -DDBITE_PLAYER_EXPORTS 27 ${QT_DEFINITIONS} 28 28 ) 29 29 … … 32 32 # ======================================== 33 33 include_directories( 34 ${CMAKE_BINARY_DIR}/DBITEPlayer35 ${QT_INCLUDE_DIR}34 ${CMAKE_BINARY_DIR}/DBITEPlayer 35 ${QT_INCLUDE_DIR} 36 36 ) 37 37 … … 40 40 # ======================================== 41 41 set( 42 PROJECT_SRCS43 ./DbtPlyEngine.cpp44 ./DbtPlyUserInterface.cpp45 ./DbtPlyEngineStateChart.cpp46 ./DbtPlyFileManager.cpp47 ./DbtPlyTrigger.cpp48 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngine.h49 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyFileManager.h50 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyTrigger.h51 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngineStateChart.h52 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyUserInterface.h42 PROJECT_SRCS 43 ./DbtPlyEngine.cpp 44 ./DbtPlyUserInterface.cpp 45 ./DbtPlyEngineStateChart.cpp 46 ./DbtPlyFileManager.cpp 47 ./DbtPlyTrigger.cpp 48 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngine.h 49 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyFileManager.h 50 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyTrigger.h 51 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngineStateChart.h 52 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyUserInterface.h 53 53 ) 54 54 … … 57 57 # ======================================== 58 58 set( 59 FILES_TO_MOC60 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngine.h61 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyFileManager.h62 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyTrigger.h63 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyUserInterface.h59 FILES_TO_MOC 60 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngine.h 61 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyFileManager.h 62 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyTrigger.h 63 ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyUserInterface.h 64 64 ) 65 65 … … 68 68 # ======================================== 69 69 qt4_wrap_cpp( 70 PROJECT_MOC_SRCS71 ${FILES_TO_MOC}70 PROJECT_MOC_SRCS 71 ${FILES_TO_MOC} 72 72 ) 73 73 … … 82 82 # ======================================== 83 83 pacpus_add_library( 84 ${PROJECT_NAME} SHARED85 ${PROJECT_SRCS}86 ${PROJECT_MOC_SRCS}84 ${PROJECT_NAME} SHARED 85 ${PROJECT_SRCS} 86 ${PROJECT_MOC_SRCS} 87 87 ) 88 88 … … 92 92 # All platform 93 93 target_link_libraries( 94 ${PROJECT_NAME}95 FileLib96 PacpusTools97 ${QT_LIBRARIES}94 ${PROJECT_NAME} 95 FileLib 96 PacpusTools 97 ${QT_LIBRARIES} 98 98 ) 99 99 # Windows platform 100 if 101 target_link_libraries(102 ${PROJECT_NAME}103 ROAD_TIME104 Winmm105 )100 if(WIN32) 101 target_link_libraries( 102 ${PROJECT_NAME} 103 ROAD_TIME 104 Winmm 105 ) 106 106 endif() 107 107 -
trunk/src/FileLib/CMakeLists.txt
r28 r58 13 13 # ======================================== 14 14 set( 15 PROJECT_SRCS16 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteException.h17 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteFile.h18 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteFileTypes.h19 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/hdfile_header_t20 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h21 src/DbiteException.cpp22 src/DbiteFile.cpp15 PROJECT_SRCS 16 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteException.h 17 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteFile.h 18 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteFileTypes.h 19 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/hdfile_header_t 20 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h 21 src/DbiteException.cpp 22 src/DbiteFile.cpp 23 23 ) 24 24 … … 27 27 # ======================================== 28 28 pacpus_add_library( 29 ${PROJECT_NAME}30 ${PROJECT_SRCS}29 ${PROJECT_NAME} 30 ${PROJECT_SRCS} 31 31 ) 32 32 … … 35 35 # ======================================== 36 36 target_link_libraries( 37 ${PROJECT_NAME}38 PacpusLib37 ${PROJECT_NAME} 38 PacpusLib 39 39 ) 40 40 -
trunk/src/PacpusLib/CMakeLists.txt
r28 r58 13 13 # ======================================== 14 14 if(QT4_FOUND) 15 set(QT_USE_QTXML true)16 include(${QT_USE_FILE})15 set(QT_USE_QTXML true) 16 include(${QT_USE_FILE}) 17 17 else() 18 message(ERROR "Qt4 needed")18 message(ERROR "Qt4 needed") 19 19 endif() 20 20 … … 23 23 # ======================================== 24 24 add_definitions( 25 -DPACPUSLIB_EXPORTS26 -DQT_NO_KEYWORDS27 ${QT_DEFINITIONS}25 -DPACPUSLIB_EXPORTS 26 -DQT_NO_KEYWORDS 27 ${QT_DEFINITIONS} 28 28 ) 29 29 … … 32 32 # ======================================== 33 33 include_directories( 34 ${QT_INCLUDE_DIR}34 ${QT_INCLUDE_DIR} 35 35 ) 36 36 … … 39 39 # ======================================== 40 40 set( 41 PROJECT_SRCS42 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h43 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentBase.h44 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h45 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h46 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentManager.h47 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/Log.h48 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpus.h49 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h50 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlComponentConfig.h51 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlConfigFile.h52 ./ComponentBase.cpp53 ./ComponentFactoryBase.cpp54 ./ComponentManager.cpp55 ./Log.cpp56 ./XmlComponentConfig.cpp57 ./XmlConfigFile.cpp41 PROJECT_SRCS 42 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h 43 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentBase.h 44 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h 45 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h 46 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentManager.h 47 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/Log.h 48 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpus.h 49 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h 50 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlComponentConfig.h 51 ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlConfigFile.h 52 ./ComponentBase.cpp 53 ./ComponentFactoryBase.cpp 54 ./ComponentManager.cpp 55 ./Log.cpp 56 ./XmlComponentConfig.cpp 57 ./XmlConfigFile.cpp 58 58 ) 59 59 … … 62 62 # ======================================== 63 63 pacpus_add_library( 64 ${PROJECT_NAME} SHARED65 ${PROJECT_SRCS}64 ${PROJECT_NAME} SHARED 65 ${PROJECT_SRCS} 66 66 ) 67 67 … … 70 70 # ======================================== 71 71 target_link_libraries( 72 ${PROJECT_NAME}73 ${QT_LIBRARIES}74 ${PACPUS_DEPENDENCIES_LIB}72 ${PROJECT_NAME} 73 ${QT_LIBRARIES} 74 ${PACPUS_DEPENDENCIES_LIB} 75 75 ) 76 76 -
trunk/src/PacpusSensor/CMakeLists.txt
r23 r58 59 59 # ======================================== 60 60 pacpus_add_executable( 61 ${PROJECT_NAME}62 ./src/main.cpp63 ./src/ui/pacpusmainwindow.cpp64 ./src/ui/pacpusmainwindow.h65 ${SENSOR_MOC_SOURCES}66 ${SENSOR_UI_CLASSES}61 ${PROJECT_NAME} 62 ./src/main.cpp 63 ./src/ui/pacpusmainwindow.cpp 64 ./src/ui/pacpusmainwindow.h 65 ${SENSOR_MOC_SOURCES} 66 ${SENSOR_UI_CLASSES} 67 67 ) 68 68 … … 72 72 # All the platform 73 73 target_link_libraries( 74 ${PROJECT_NAME}75 dbiteplayerlib76 FileLib77 PacpusLib78 PacpusTools79 ${QT_LIBRARIES}74 ${PROJECT_NAME} 75 dbiteplayerlib 76 FileLib 77 PacpusLib 78 PacpusTools 79 ${QT_LIBRARIES} 80 80 ) 81 81 # Windows 82 if 83 target_link_libraries(84 ${PROJECT_NAME}85 ROAD_TIME86 Winmm87 )82 if(WIN32) 83 target_link_libraries( 84 ${PROJECT_NAME} 85 ROAD_TIME 86 Winmm 87 ) 88 88 endif() 89 89 -
trunk/src/PacpusTools/CMakeLists.txt
r28 r58 13 13 # ======================================== 14 14 if(QT4_FOUND) 15 set(QT_USE_QTXML true)16 include(${QT_USE_FILE})15 set(QT_USE_QTXML true) 16 include(${QT_USE_FILE}) 17 17 else() 18 message(ERROR "Qt4 needed")18 message(ERROR "Qt4 needed") 19 19 endif(QT4_FOUND) 20 20 … … 23 23 # ======================================== 24 24 add_definitions( 25 ${QT_DEFINITIONS}25 ${QT_DEFINITIONS} 26 26 ) 27 27 … … 30 30 # ======================================== 31 31 include_directories( 32 ${QT_INCLUDE_DIR}32 ${QT_INCLUDE_DIR} 33 33 ) 34 34 … … 37 37 # ======================================== 38 38 set( 39 PROJECT_SRCS40 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/matrice.h41 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/BinaryDecoder.h42 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h43 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/ShMem.h44 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h45 ./src/matrice.cpp46 ./src/geodesie.cpp47 ./src/AsyncWorkerBase.cpp48 ./src/PeriodicWorker.cpp39 PROJECT_SRCS 40 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/matrice.h 41 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/BinaryDecoder.h 42 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h 43 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/ShMem.h 44 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h 45 ./src/matrice.cpp 46 ./src/geodesie.cpp 47 ./src/AsyncWorkerBase.cpp 48 ./src/PeriodicWorker.cpp 49 49 ) 50 50 … … 53 53 # ======================================== 54 54 set( 55 FILES_TO_MOC56 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h57 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h55 FILES_TO_MOC 56 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h 57 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h 58 58 ) 59 59 … … 62 62 # ======================================== 63 63 qt4_wrap_cpp( 64 PROJECT_MOC_SRCS65 ${FILES_TO_MOC}64 PROJECT_MOC_SRCS 65 ${FILES_TO_MOC} 66 66 ) 67 67 … … 71 71 # Unix 72 72 if(UNIX) 73 list(74 APPEND PROJECT_SRCS75 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h76 src/PosixShMem.cpp77 )73 list( 74 APPEND PROJECT_SRCS 75 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h 76 src/PosixShMem.cpp 77 ) 78 78 endif() 79 79 # Windows 80 80 if(WIN32) 81 list(82 APPEND PROJECT_SRCS83 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/Win32ShMem.h84 src/Win32ShMem.cpp85 )81 list( 82 APPEND PROJECT_SRCS 83 ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/Win32ShMem.h 84 src/Win32ShMem.cpp 85 ) 86 86 endif() 87 87 … … 90 90 # ======================================== 91 91 pacpus_add_library( 92 ${PROJECT_NAME} 93 ${PROJECT_SRCS} 94 ${PROJECT_MOC_SRCS} 95 ) 96 97 # ======================================== 98 # Properties 99 # ======================================== 100 set_target_properties( 101 ${PROJECT_NAME} 102 PROPERTIES DEBUG_POSTFIX "_d" 92 ${PROJECT_NAME} 93 ${PROJECT_SRCS} 94 ${PROJECT_MOC_SRCS} 103 95 ) 104 96 -
trunk/src/RoadTime/CMakeLists.txt
r28 r58 13 13 # ======================================== 14 14 add_definitions( 15 -DROAD_TIME_EXPORTS15 -DROAD_TIME_EXPORTS 16 16 ) 17 17 … … 20 20 # ======================================== 21 21 set( 22 PROJECT_SRCS23 ./src/road_time.c22 PROJECT_SRCS 23 ./src/road_time.c 24 24 ) 25 25 … … 28 28 # ======================================== 29 29 pacpus_add_library( 30 ${PROJECT_NAME} SHARED31 ${PROJECT_SRCS}30 ${PROJECT_NAME} SHARED 31 ${PROJECT_SRCS} 32 32 ) 33 33
Note:
See TracChangeset
for help on using the changeset viewer.
