Changeset 140 in pacpusframework for branches


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0-beta1/CMakeLists.txt

    r128 r140  
    5757
    5858# ========================================
    59 # Handle platform specific behaviors
     59# Handle platform-specific behaviour
    6060# ========================================
    6161include(${PACPUS_CMAKE_DIR}/PacpusPlatforms.cmake)
     62
     63# ========================================
     64# Compiler flags coming from PacpusDependencies and PacpusPlatforms
     65# ========================================
     66#message(STATUS "\${PACPUS_DEFINITIONS} = ${PACPUS_DEFINITIONS}")
     67add_definitions(${PACPUS_DEFINITIONS})
    6268
    6369# ========================================
     
    6672# Includes directories
    6773include_directories(
    68   ${PACPUS_DEPENDENCIES_INC}
    69   ${PACPUS_INCLUDE_DIR}
     74    ${PACPUS_DEPENDENCIES_INC}
     75    ${PACPUS_INCLUDE_DIR}
    7076)
    71 # Compiler flags coming from PacpusDependencies and PacpusPlatforms
    72 add_definitions(${PACPUS_DEFINITIONS})
    7377
    7478# ========================================
  • branches/2.0-beta1/src/DBITEPlayerLib/CMakeLists.txt

    r120 r140  
    6565# Call MOC
    6666# ========================================
    67 qt5_wrap_cpp(
     67qt_wrap_cpp(
    6868    PROJECT_MOC_SRCS
    6969    ${FILES_TO_MOC}
  • branches/2.0-beta1/src/PacpusLib/CMakeLists.txt

    r137 r140  
    4747# List of sources
    4848# ========================================
    49 set(
    50     PROJECT_SRCS
     49set(PROJECT_SRCS
    5150    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h
    5251    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentBase.h
     
    7877)
    7978
    80 set(
    81     FILES_TO_MOC
     79set(FILES_TO_MOC
    8280    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/InputOutputBase.h
    8381    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/PacpusEvent.h
    8482)
    8583
    86 qt5_wrap_cpp(
     84qt_wrap_cpp(
    8785     PROJECT_MOC_SRCS
    8886     ${FILES_TO_MOC}
  • branches/2.0-beta1/src/PacpusSensor/CMakeLists.txt

    r123 r140  
    4848set(SENSOR_MOC_CLASSES src/ui/pacpusmainwindow.h)
    4949
    50 qt5_wrap_ui(SENSOR_UI_SOURCES_H ${SENSOR_UI_CLASSES})
    51 qt5_wrap_cpp(SENSOR_MOC_SOURCES ${SENSOR_MOC_CLASSES})
     50qt_wrap_ui(SENSOR_UI_SOURCES_H ${SENSOR_UI_CLASSES})
     51qt_wrap_cpp(SENSOR_MOC_SOURCES ${SENSOR_MOC_CLASSES})
    5252
    5353source_group(Main_ui FILES ${PROJECT_SRCS} )
  • branches/2.0-beta1/src/PacpusTools/CMakeLists.txt

    r126 r140  
    6363# Call MOC
    6464# ========================================
    65 qt5_wrap_cpp(
     65qt_wrap_cpp(
    6666    PROJECT_MOC_SRCS
    6767    ${FILES_TO_MOC}
     
    7373# Unix
    7474if(UNIX)
    75     list(
    76         APPEND PROJECT_SRCS
     75    list(APPEND PROJECT_SRCS
    7776        ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h
    7877        src/PosixShMem.cpp
     
    8180# Windows
    8281if(WIN32)
    83     list(
    84         APPEND PROJECT_SRCS
     82    list(APPEND PROJECT_SRCS
    8583        ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/Win32ShMem.h
    8684        src/Win32ShMem.cpp
     
    102100
    103101set(OPT_LIBRARIES
    104         optimized PacpusLib debug PacpusLib_d
     102    optimized PacpusLib debug PacpusLib_d
    105103)
    106104
Note: See TracChangeset for help on using the changeset viewer.