Changeset 140 in pacpusframework

Timestamp:

Jul 30, 2013, 4:50:20 PM (11 years ago)

Author:

Marek Kurdej

Message:

Update: using qt_wrap_ui, qt_wrap_cpp everywhere.

Location:

branches/2.0-beta1

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/DBITEPlayerLib/CMakeLists.txt (modified) (1 diff)
• src/PacpusLib/CMakeLists.txt (modified) (2 diffs)
• src/PacpusSensor/CMakeLists.txt (modified) (1 diff)
• src/PacpusTools/CMakeLists.txt (modified) (4 diffs)

branches/2.0-beta1/CMakeLists.txt

@@ -57 +57 @@
 
 # ========================================
-# Handle platform specific behaviors
+# Handle platform-specific behaviour
 # ========================================
 include(${PACPUS_CMAKE_DIR}/PacpusPlatforms.cmake)
+
+# ========================================
+# Compiler flags coming from PacpusDependencies and PacpusPlatforms
+# ========================================
+#message(STATUS "\${PACPUS_DEFINITIONS} = ${PACPUS_DEFINITIONS}")
+add_definitions(${PACPUS_DEFINITIONS})
 
 # ========================================
@@ -66 +72 @@
 # Includes directories
 include_directories(
-  ${PACPUS_DEPENDENCIES_INC}
-  ${PACPUS_INCLUDE_DIR}
+    ${PACPUS_DEPENDENCIES_INC}
+    ${PACPUS_INCLUDE_DIR}
 )
-# Compiler flags coming from PacpusDependencies and PacpusPlatforms
-add_definitions(${PACPUS_DEFINITIONS})
 
 # ========================================

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

@@ -65 +65 @@
 # Call MOC
 # ========================================
-qt5_wrap_cpp(
+qt_wrap_cpp(
     PROJECT_MOC_SRCS
     ${FILES_TO_MOC}

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

@@ -47 +47 @@
 # List of sources
 # ========================================
-set(
-    PROJECT_SRCS
+set(PROJECT_SRCS
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentBase.h
@@ -78 +77 @@
 )
 
-set(
-    FILES_TO_MOC
+set(FILES_TO_MOC
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/InputOutputBase.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/PacpusEvent.h
 )
 
-qt5_wrap_cpp(
+qt_wrap_cpp(
      PROJECT_MOC_SRCS
      ${FILES_TO_MOC}

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

@@ -48 +48 @@
 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})
+qt_wrap_ui(SENSOR_UI_SOURCES_H ${SENSOR_UI_CLASSES})
+qt_wrap_cpp(SENSOR_MOC_SOURCES ${SENSOR_MOC_CLASSES})
 
 source_group(Main_ui FILES ${PROJECT_SRCS} )

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

@@ -63 +63 @@
 # Call MOC
 # ========================================
-qt5_wrap_cpp(
+qt_wrap_cpp(
     PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
@@ -73 +73 @@
 # Unix
 if(UNIX)
-    list(
-        APPEND PROJECT_SRCS
+    list(APPEND PROJECT_SRCS
         ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h
         src/PosixShMem.cpp
@@ -81 +80 @@
 # Windows
 if(WIN32)
-    list(
-        APPEND PROJECT_SRCS
+    list(APPEND PROJECT_SRCS
         ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/Win32ShMem.h
         src/Win32ShMem.cpp
@@ -102 +100 @@
 
 set(OPT_LIBRARIES
-        optimized PacpusLib debug PacpusLib_d
+    optimized PacpusLib debug PacpusLib_d
 )