Changeset 27 in pacpussensors


Ignore:
Timestamp:
Oct 23, 2013, 9:15:35 AM (11 years ago)
Author:
Marek Kurdej
Message:

Minor: CMakeLists fixes (Qt4/Qt5 compatibility).

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Alasca/CMakeLists.txt

    r11 r27  
    33################################################################################
    44add_definitions( -DALASCAXT_EXPORTS )
    5 
    6 # ========================================
    7 # Configure qt4
    8 # ========================================
    9 if(QT4_FOUND)
    10   set(QT_USE_QTXML true)
    11   set(QT_USE_QTNETWORK true)
    12   include(${QT_USE_FILE})
    13 else()
    14   message(ERROR "Qt4 needed")
    15 endif()
    165
    176# ========================================
    … …  
    7059# Call MOC
    7160# ========================================
    72 qt4_wrap_cpp(
     61qt_wrap_cpp(
    7362    PROJECT_MOC_SRCS
    7463    ${FILES_TO_MOC}
    7564)
    7665
    77 qt4_wrap_ui(
     66qt_wrap_ui(
    7867    PROJECT_UI_SRCS
    7968    ${UI_FILES}
    … …  
    121110# ========================================
    122111pacpus_install(${PROJECT_NAME})
    123 

  • trunk/CMakeLists.txt

    r21 r27  
    4848endif()
    4949
    50     include(${CMAKE_MODULE_PATH}/PacpusUtilities.cmake)
    51     include(${CMAKE_MODULE_PATH}/PacpusConfiguration.cmake)
    52     include(${CMAKE_MODULE_PATH}/PacpusDependencies.cmake)
    53     include(${CMAKE_MODULE_PATH}/PacpusPlatforms.cmake)
     50include(${CMAKE_MODULE_PATH}/PacpusUtilities.cmake)
     51include(${CMAKE_MODULE_PATH}/PacpusConfiguration.cmake)
     52include(${CMAKE_MODULE_PATH}/PacpusDependencies.cmake)
     53include(${CMAKE_MODULE_PATH}/PacpusPlatforms.cmake)
    5454
    5555# ========================================

  • trunk/StdDbtPlayerComponents/CMakeLists.txt

    r16 r27  
    33################################################################################
    44add_definitions( -DSTDDBTPLAYERCOMPONENTS_EXPORTS )
    5 
    6 # ========================================
    7 # Configure qt4
    8 # ========================================
    9 if(QT4_FOUND)
    10   set(QT_USE_QTXML true)
    11   set(QT_USE_QTNETWORK true)
    12   include(${QT_USE_FILE})
    13 else()
    14   message(ERROR "Qt4 needed")
    15 endif()
    16 
    17 # ========================================
    18 # Compiler definitions
    19 # ========================================
    20 add_definitions(
    21   ${QT_DEFINITIONS}
    22 )
    235
    246# ========================================
    … …  
    7860# Call MOC
    7961# ========================================
    80 qt4_wrap_cpp(
     62qt_wrap_cpp(
    8163    PROJECT_MOC_SRCS
    8264    ${FILES_TO_MOC}
    8365)
    8466
    85 qt4_wrap_ui(
     67qt_wrap_ui(
    8668    PROJECT_UI_SRCS
    8769    ${UI_FILES}
    … …  
    127109# ========================================
    128110pacpus_install(${PROJECT_NAME})
    129 
Note: See TracChangeset for help on using the changeset viewer.