Changeset 28 in pacpusframework for trunk


Ignore:
Timestamp:
Jan 8, 2013, 5:28:51 PM (12 years ago)
Author:
sgosseli
Message:

Major: to avoid names collision with other libraries, we should include 'Pacpus/kernel/file.h' instead of 'kernel/file.h'
To work-around this patch, if you use old stuff, you can add in your cmake: include_directories(${PACPUS_INCLUDE_DIR}/Pacpus)

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r26 r28  
    2727set(PACPUS_CMAKE_DIR        ${PACPUS_ROOT_DIR}/cmake)
    2828set(PACPUS_DOC_DIR          ${PACPUS_ROOT_DIR}/doc)
    29 set(PACPUS_INCLUDE_DIR      ${PACPUS_ROOT_DIR}/include/Pacpus)
     29set(PACPUS_INCLUDE_DIR      ${PACPUS_ROOT_DIR}/include/)
    3030set(PACPUS_SCRIPTS_DIR      ${PACPUS_ROOT_DIR}/scripts)
    3131set(PACPUS_SOURCE_DIR       ${PACPUS_ROOT_DIR}/src)
     
    6161# ========================================
    6262# Includes directories
    63 include_directories(${PACPUS_DEPENDENCIES_INC})
    64 include_directories(${PACPUS_INCLUDE_DIR})
     63include_directories(
     64  ${PACPUS_DEPENDENCIES_INC}
     65  ${PACPUS_INCLUDE_DIR}
     66  ${PACPUS_INCLUDE_DIR}/Pacpus
     67  # FIXME: remove the include above when all the files are including the right files.
     68)
    6569# Compiler flags coming from PacpusDependencies and PacpusPlatforms
    6670add_definitions(${PACPUS_DEFINITIONS})
  • trunk/cmake/PacpusInstall.cmake

    r26 r28  
    1313install(
    1414  DIRECTORY
    15     ${PACPUS_ROOT_DIR}/cmake
     15    ${PACPUS_CMAKE_DIR}
    1616  DESTINATION
    1717    ${PACPUS_INSTALL_DIR}
     
    2525    ${PACPUS_INCLUDE_DIR}
    2626  DESTINATION
    27     ${PACPUS_INSTALL_DIR}/include
     27    ${PACPUS_INSTALL_DIR}
    2828)
    2929
  • trunk/src/DBITEPlayer/CMakeLists.txt

    r23 r28  
    4040set(
    4141  PROJECT_SRCS
    42   ${PACPUS_INCLUDE_DIR}/kernel/cstdint.h
    43   ${PACPUS_INCLUDE_DIR}/kernel/ComponentBase.h
    44   ${PACPUS_INCLUDE_DIR}/kernel/ComponentFactory.h
    45   ${PACPUS_INCLUDE_DIR}/kernel/ComponentFactoryBase.h
    46   ${PACPUS_INCLUDE_DIR}/kernel/ComponentManager.h
    47   ${PACPUS_INCLUDE_DIR}/kernel/Log.h
    48   ${PACPUS_INCLUDE_DIR}/kernel/pacpus.h
    49   ${PACPUS_INCLUDE_DIR}/kernel/road_time.h
    50   ${PACPUS_INCLUDE_DIR}/kernel/XmlComponentConfig.h
    51   ${PACPUS_INCLUDE_DIR}/kernel/XmlConfigFile.h
     42  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h
     43  ${PACPUS_INCLUDE_DIR}/Pacpus//kernel/ComponentBase.h
     44  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h
     45  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h
     46  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentManager.h
     47  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/Log.h
     48  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpus.h
     49  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h
     50  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlComponentConfig.h
     51  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlConfigFile.h
    5252  ./ComponentBase.cpp
    5353  ./ComponentFactoryBase.cpp
  • trunk/src/DBITEPlayerLib/CMakeLists.txt

    r23 r28  
    4646  ./DbtPlyFileManager.cpp
    4747  ./DbtPlyTrigger.cpp
    48   ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyEngine.h
    49   ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyFileManager.h
    50   ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyTrigger.h
    51   ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyEngineStateChart.h
    52   ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyUserInterface.h
     48  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngine.h
     49  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyFileManager.h
     50  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyTrigger.h
     51  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngineStateChart.h
     52  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyUserInterface.h
    5353)
    5454
     
    5858set(
    5959  FILES_TO_MOC
    60   ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyEngine.h
    61   ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyFileManager.h
    62   ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyTrigger.h
    63   ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyUserInterface.h
     60  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngine.h
     61  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyFileManager.h
     62  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyTrigger.h
     63  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyUserInterface.h
    6464)
    6565
  • trunk/src/FileLib/CMakeLists.txt

    r25 r28  
    1414set(
    1515  PROJECT_SRCS
    16   ${PACPUS_INCLUDE_DIR}/kernel/DbiteException.h
    17   ${PACPUS_INCLUDE_DIR}/kernel/DbiteFile.h
    18   ${PACPUS_INCLUDE_DIR}/kernel/DbiteFileTypes.h
    19   ${PACPUS_INCLUDE_DIR}/kernel/hdfile_header_t
    20   ${PACPUS_INCLUDE_DIR}/kernel/road_time.h
     16  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteException.h
     17  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteFile.h
     18  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteFileTypes.h
     19  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/hdfile_header_t
     20  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h
    2121  src/DbiteException.cpp
    2222  src/DbiteFile.cpp
  • trunk/src/PacpusLib/CMakeLists.txt

    r23 r28  
    4040set(
    4141  PROJECT_SRCS
    42   ${PACPUS_INCLUDE_DIR}/kernel/cstdint.h
    43   ${PACPUS_INCLUDE_DIR}/kernel/ComponentBase.h
    44   ${PACPUS_INCLUDE_DIR}/kernel/ComponentFactory.h
    45   ${PACPUS_INCLUDE_DIR}/kernel/ComponentFactoryBase.h
    46   ${PACPUS_INCLUDE_DIR}/kernel/ComponentManager.h
    47   ${PACPUS_INCLUDE_DIR}/kernel/Log.h
    48   ${PACPUS_INCLUDE_DIR}/kernel/pacpus.h
    49   ${PACPUS_INCLUDE_DIR}/kernel/road_time.h
    50   ${PACPUS_INCLUDE_DIR}/kernel/XmlComponentConfig.h
    51   ${PACPUS_INCLUDE_DIR}/kernel/XmlConfigFile.h
     42  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h
     43  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentBase.h
     44  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h
     45  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h
     46  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentManager.h
     47  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/Log.h
     48  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpus.h
     49  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h
     50  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlComponentConfig.h
     51  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlConfigFile.h
    5252  ./ComponentBase.cpp
    5353  ./ComponentFactoryBase.cpp
  • trunk/src/PacpusTools/CMakeLists.txt

    r23 r28  
    3838set(
    3939  PROJECT_SRCS
    40   ${PACPUS_INCLUDE_DIR}/PacpusTools/matrice.h
    41   ${PACPUS_INCLUDE_DIR}/PacpusTools/BinaryDecoder.h
    42   ${PACPUS_INCLUDE_DIR}/PacpusTools/PosixShMem.h
    43   ${PACPUS_INCLUDE_DIR}/PacpusTools/ShMem.h
    44   ${PACPUS_INCLUDE_DIR}/PacpusTools/geodesie.h
     40  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/matrice.h
     41  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/BinaryDecoder.h
     42  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h
     43  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/ShMem.h
     44  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h
    4545  ./src/matrice.cpp
    4646  ./src/geodesie.cpp
     
    5454set(
    5555  FILES_TO_MOC
    56   ${PACPUS_INCLUDE_DIR}/PacpusTools/AsyncWorkerBase.h
    57   ${PACPUS_INCLUDE_DIR}/PacpusTools/PeriodicWorker.h
     56  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h
     57  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h
    5858)
    5959
     
    7373  list(
    7474    APPEND PROJECT_SRCS
    75     ${PACPUS_INCLUDE_DIR}/PacpusTools/PosixShMem.h
     75    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h
    7676    src/PosixShMem.cpp
    7777  )
     
    8181  list(
    8282    APPEND PROJECT_SRCS
    83     ${PACPUS_INCLUDE_DIR}/PacpusTools/Win32ShMem.h
     83    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/Win32ShMem.h
    8484    src/Win32ShMem.cpp
    8585  )
  • trunk/src/RoadTime/CMakeLists.txt

    r23 r28  
    1414add_definitions(
    1515  -DROAD_TIME_EXPORTS
    16 )
    17 
    18 # ========================================
    19 # Include directories
    20 # ========================================
    21 include_directories(
    22   ${PACPUS_INCLUDE_DIR}
    2316)
    2417
Note: See TracChangeset for help on using the changeset viewer.