Changeset 111 in pacpusframework


Ignore:
Timestamp:
Jun 13, 2013, 3:38:27 PM (11 years ago)
Author:
morasjul
Message:

Beta-2 : Add missing file inputOutputBase.cpp, et clean CMakeList

Location:
branches/2.0-beta1/src
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/2.0-beta1/src/DBITEPlayer/CMakeLists.txt

    r110 r111  
    88#################################################
    99project(DBITEPlayer)
    10 
    11 # ========================================
    12 # Configure qt4
    13 # ========================================
    14 #if(QT4_FOUND)
    15 #    set(QT_USE_QTXML true)
    16 #    include(${QT_USE_FILE})
    17 #else()
    18 #    message(ERROR "Qt4 needed")
    19 #endif(QT4_FOUND)
    2010
    2111# ========================================
    … …  
    4030    ${PROJECT_BINARY_DIR}/../PacpusLib
    4131    ${PROJECT_BINARY_DIR}/../FileLib
     32    ${PROJECT_BINARY_DIR}/../DBITEPlayerLib
    4233)
    4334
    … …  
    7667# Libraries & Dependencies
    7768# ========================================
     69# Windows platform
     70if(WIN32)
     71set(LIBS
     72        optimized ROAD_TIME debug ROAD_TIME_d
     73        Winmm
     74)
     75endif()
     76
    7877# All the platform
    7978target_link_libraries(
    8079    ${PROJECT_NAME}
    8180    ${QT_LIBRARIES}
    82     dbiteplayerlib
    83 #    FileLib
    84 #    PacpusLib
    85 #    PacpusTools
     81    ${LIBS}
     82    ${PACPUS_DEPENDENCIES_LIB}
     83    optimized dbiteplayerlib debug dbiteplayerlib_d
     84    optimized FileLib debug FileLib_d
     85    optimized PacpusLib debug PacpusLib_d
    8686)
    87 # Windows
    88 if(WIN32)
    89     target_link_libraries(
    90         ${PROJECT_NAME}
    91         ROAD_TIME
    92         Winmm
    93     )
    94 endif()
    9587
    9688# ========================================

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

    r110 r111  
    88#################################################
    99project(dbiteplayerlib)
    10 
    11 # ========================================
    12 # Configure qt4
    13 # ========================================
    14 #if(QT4_FOUND)
    15 #    set(QT_USE_QTXML true)
    16 #    include(${QT_USE_FILE})
    17 #else()
    18 #    message(ERROR "Qt4 needed")
    19 #endif(QT4_FOUND)
    2010
    2111# ========================================
    … …  
    4131    ${PROJECT_BINARY_DIR}/../PacpusLib
    4232    ${PROJECT_BINARY_DIR}/../FileLib
     33    ${PROJECT_BINARY_DIR}/../RoadTime
    4334)
    4435
    … …  
    9788# Libraries
    9889# ========================================
     90# Windows platform
     91if(WIN32)
     92set(LIBS
     93        optimized ROAD_TIME debug ROAD_TIME_d
     94        Winmm
     95)
     96endif()
     97
    9998# All platform
    10099target_link_libraries(
    101100    ${PROJECT_NAME}
    102101    ${PACPUS_DEPENDENCIES_LIB}
    103     #FileLib
    104     #PacpusTools
     102    ${LIBS}
    105103    optimized FileLib debug FileLib_d
    106104    optimized PacpusLib debug PacpusLib_d
    107105    ${QT_LIBRARIES}
    108106)
    109 # Windows platform
    110 if(WIN32)
    111     target_link_libraries(
    112         ${PROJECT_NAME}
    113         ROAD_TIME
    114                 #optimized ROAD_TIME debug ROAD_TIME_d
    115         Winmm
    116     )
    117 endif()
    118107
    119108# ========================================

  • branches/2.0-beta1/src/FileLib/CMakeLists.txt

    r110 r111  
    4949# Libraries
    5050# ========================================
    51 if(WIN32)        # TODO find other solution
     51if(WIN32)
    5252target_link_libraries(
    5353    ${PROJECT_NAME}
    5454    ${PACPUS_DEPENDENCIES_LIB}
    5555    optimized PacpusLib debug PacpusLib_d
    56         #PacpusLib
    5756)
    5857endif()

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

    r110 r111  
    9797
    9898if(UNIX)
    99         #set(LIBS FileLib)
    10099        set(LIBS optimized FileLib debug FileLib_d)
    101100else()
    102101    set(LIBS
    103         #optimized ROAD_TIME debug ROAD_TIME_d # TODO why debug not found ?
    104         ROAD_TIME
     102        optimized ROAD_TIME debug ROAD_TIME_d
    105103        )
    106104endif()

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

    r110 r111  
    88#################################################
    99project(PacpusSensor)
    10 
    11 # ========================================
    12 # Configure qt4
    13 # ========================================
    14 #if(QT4_FOUND)
    15 #    set(QT_USE_QTXML true)
    16 #    include(${QT_USE_FILE})
    17 #else()
    18 #    message(ERROR "Qt4 needed")
    19 #endif(QT4_FOUND)
    2010
    2111# ========================================
    … …  
    7666# Libraries
    7767# ========================================
     68# Windows platform
     69if(WIN32)
     70set(LIBS
     71        optimized ROAD_TIME debug ROAD_TIME_d
     72        Winmm
     73)
     74endif()
     75
    7876# All the platform
    7977target_link_libraries(
    8078    ${PROJECT_NAME}
    8179    ${PACPUS_DEPENDENCIES_LIB}
    82 #    dbiteplayerlib
    83 #    FileLib
    84 #    PacpusLib
    85 #    PacpusTools
    8680    optimized FileLib debug FileLib_d
    8781    optimized PacpusLib debug PacpusLib_d
     82    ${LIBS}
    8883    ${QT_LIBRARIES}
    8984)
    90 # Windows
    91 if(WIN32)
    92     target_link_libraries(
    93         ${PROJECT_NAME}
    94         ROAD_TIME
    95         Winmm
    96     )
    97 endif()
    9885
    9986# ========================================

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

    r110 r111  
    88#################################################
    99project(PacpusTools)
    10 
    11 # ========================================
    12 # Configure qt4
    13 # ========================================
    14 #if(QT4_FOUND)
    15 #    set(QT_USE_QTXML true)
    16 #    include(${QT_USE_FILE})
    17 #else()
    18 #    message(ERROR "Qt4 needed")
    19 #endif(QT4_FOUND)
    2010
    2111# ========================================
Note: See TracChangeset for help on using the changeset viewer.