Changeset 331 in pacpusframework for branches/0.1.x

Timestamp:

Dec 4, 2014, 12:33:07 PM (10 years ago)

Author:

phudelai

Message:

Icon added to all graphic applications

Location:

branches/0.1.x/src

Files:

• DBITEPlayer/CMakeLists.txt (modified) (2 diffs)
• PacpusSensor/CMakeLists.txt (modified) (7 diffs)
• dbcDecriptor/CMakeLists.txt (modified) (3 diffs)
• dbcDecriptor/dbcDecriptor.pro (deleted)
• dbcDecriptor/dbcDecriptor.rc (deleted)
• dbcDecriptor/heudiasyc.ico (deleted)
• dbcDecriptor/main.cpp (deleted)
• dbcDecriptor/mainwindow.cpp (deleted)
• dbcDecriptor/mainwindow.h (deleted)
• dbcDecriptor/mainwindow.ui (deleted)
• dbcDecriptor/src (added)
• dbcDecriptor/src/main.cpp (added)
• dbcDecriptor/src/mainwindow.cpp (added)
• dbcDecriptor/src/mainwindow.h (added)
• dbcDecriptor/src/mainwindow.ui (added)
• dbcDecriptor/src/structure.h (added)
• dbcDecriptor/structure.h (deleted)
• ico (added)
• ico/heudiasyc.ico (added)
• ico/heudiasycIco.rc (added)

branches/0.1.x/src/DBITEPlayer/CMakeLists.txt

@@ -38 +38 @@
 set(PROJECT_HDRS
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h
-    ${PACPUS_INCLUDE_DIR}/Pacpus//kernel/ComponentBase.h
+    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentBase.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h
@@ -63 +63 @@
     ${PROJECT_NAME}
     ./src/main.cpp
+    ../ico/heudiasycIco.rc
 )
 

branches/0.1.x/src/PacpusSensor/CMakeLists.txt

@@ -13 +13 @@
 # ========================================
 add_definitions(
-  ${QT_DEFINITIONS}
+        ${QT_DEFINITIONS}
 )
 
@@ -20 +20 @@
 # ========================================
 include_directories(
-  ${PROJECT_BINARY_DIR}
-  ${QT_INCLUDE_DIR}
+        ${PROJECT_BINARY_DIR}
+        ${QT_INCLUDE_DIR}
 )
 # ========================================
@@ -27 +27 @@
 # ========================================
 link_directories(
-    ${PROJECT_BINARY_DIR}/../PacpusLib
-    ${PROJECT_BINARY_DIR}/../FileLib
+        ${PROJECT_BINARY_DIR}/../PacpusLib
+        ${PROJECT_BINARY_DIR}/../FileLib
         ${PROJECT_BINARY_DIR}/../RoadTime
 )
@@ -36 +36 @@
 # ========================================
 set(
-  PROJECT_SRCS
-  src/ui/pacpusmainwindow.cpp
-  src/ui/pacpusmainwindow.h
-  src/main.cpp
+        PROJECT_SRCS
+        src/ui/pacpusmainwindow.cpp
+        src/ui/pacpusmainwindow.h
+        src/main.cpp
 )
 
@@ -51 +51 @@
 qt_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} )
+source_group(Main_ui FILES ${PROJECT_SRCS})
+source_group(moc FILES ${SENSOR_MOC_SOURCES} ${SENSOR_UI_SOURCES_H})
 
 # ========================================
@@ -58 +58 @@
 # ========================================
 pacpus_add_executable(
-    ${PROJECT_NAME}
-    ./src/main.cpp
-    ./src/ui/pacpusmainwindow.cpp
-    ./src/ui/pacpusmainwindow.h
-    ${SENSOR_MOC_SOURCES}
-    ${SENSOR_UI_CLASSES}
+        ${PROJECT_NAME}
+        ./src/main.cpp
+        ./src/ui/pacpusmainwindow.cpp
+        ./src/ui/pacpusmainwindow.h
+        ../ico/heudiasycIco.rc
+        ${SENSOR_MOC_SOURCES}
+        ${SENSOR_UI_CLASSES}
 )
 
@@ -71 +72 @@
 
 set(OPT_LIBRARIES
-        optimized FileLib debug FileLib_d
-        optimized PacpusLib debug PacpusLib_d
+        optimized FileLib debug FileLib_d
+        optimized PacpusLib debug PacpusLib_d
 )
 
 # Windows platform
 if(WIN32)
-    LIST(APPEND OPT_LIBRARIES
-        optimized ROAD_TIME debug ROAD_TIME_d
-        Winmm
+        LIST(APPEND OPT_LIBRARIES
+                optimized ROAD_TIME debug ROAD_TIME_d
+                Winmm
 )
 endif()
 
 if(UNIX)
-    LIST(APPEND OPT_LIBRARIES
-        pthread
-    )
+        LIST(APPEND OPT_LIBRARIES
+                pthread
+)
 endif()
 
 # All the platform
 target_link_libraries(
-    ${PROJECT_NAME}
-    ${PACPUS_DEPENDENCIES_LIB}
-    ${OPT_LIBRARIES}
-    ${QT_LIBRARIES}
+        ${PROJECT_NAME}
+        ${PACPUS_DEPENDENCIES_LIB}
+        ${OPT_LIBRARIES}
+        ${QT_LIBRARIES}
 )
 

branches/0.1.x/src/dbcDecriptor/CMakeLists.txt

@@ -39 +39 @@
 SET(
         PROJECT_SRCS
-        mainwindow.cpp
-        main.cpp
-        mainwindow.h
-        structure.h
-        dbcDecriptor.rc
+        src/mainwindow.cpp
+        src/main.cpp
+        src/mainwindow.h
+        src/structure.h
+        ../ico/heudiasycIco.rc
 )
 
@@ -51 +51 @@
 SET(
         FILES_TO_MOC
-        mainwindow.h
+        src/mainwindow.h
 )
 
 SET(
         UI_FILES
-        mainwindow.ui    
+        src/mainwindow.ui    
 )
 
@@ -72 +72 @@
 )
 
-ADD_EXECUTABLE(${PROJECT_NAME} ${GUI_TYPE} ${PROJECT_SRCS} ${PROJECT_MOC_SRCS} ${PROJECT_UI_SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${QT_LIBRARIES})
+# ========================================
+# Build an executable
+# ========================================
+pacpus_add_executable(
+        ${PROJECT_NAME} 
+        ${GUI_TYPE} 
+        ${PROJECT_SRCS} 
+        ${PROJECT_MOC_SRCS} 
+        ${PROJECT_UI_SRCS}
+)
+
+# ========================================
+# Libraries
+# ========================================
+TARGET_LINK_LIBRARIES(
+        ${PROJECT_NAME} 
+        ${QT_LIBRARIES}
+)
 
 # ========================================