Changeset 2 in pacpussensors


Ignore:
Timestamp:
Jun 5, 2013, 5:36:22 PM (12 years ago)
Author:
DHERBOMEZ Gérald
Message:

correction of minor bugs (include and link). Build on Windows OK.

Location:
trunk
Files:
1 added
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Alasca/AlascaComponent.cpp

    r1 r2  
    1414#include "AlascaComponent.h"
    1515
    16 #include "AlascaDataGenerator.h"
     16//#include "AlascaDataGenerator.h"
    1717#include "AlascaSocket.h"
    1818#include "Pacpus/kernel/ComponentFactory.h"

  • trunk/Alasca/CMakeLists.txt

    r1 r2  
    3232# Link directories
    3333# ========================================
    34 link_directories(
     34link_directories( ${PACPUS_LIB_DIR}
    3535)
     36
     37message (STATUS ${PACPUS_LIB_DIR})
    3638
    3739pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
    … …  
    8789)
    8890
     91message(STATUS  ${PACPUS_DEPENDENCIES_LIB} )
     92
    8993# ========================================
    9094# Libraries
    … …  
    96100    ${QT_LIBRARIES}
    97101        ${PACPUS_DEPENDENCIES_LIB}
     102        PacpusTools
    98103)
    99104

  • trunk/CanGateway/CMakeLists.txt

    r1 r2  
    3434# Link directories
    3535# ========================================
    36 link_directories(
     36link_directories( ${PACPUS_LIB_DIR}
     37        ${CanGateway_SOURCE_DIR}/driver/libs
    3738)
    3839
    … …  
    135136    ${QT_LIBRARIES}
    136137        ${PACPUS_DEPENDENCIES_LIB}
    137         ${LIB}
     138        ${LIBS}
     139        PacpusTools
    138140)
    139141

  • trunk/CanGateway/CanDecoderBase.cpp

    r1 r2  
    1212*********************************************************************/
    1313
    14 #include "kernel/ComponentManager.h"
     14#include "Pacpus/kernel/ComponentManager.h"
    1515
    1616using namespace pacpus;

  • trunk/CanGateway/CanDecoderBase.h

    r1 r2  
    1717
    1818#include "CanGatewayConfig.h"
    19 #include "kernel/ComponentBase.h"
    20 #include "structure/structureCanCarmen.h"
     19#include "Pacpus/kernel/ComponentBase.h"
     20#include "CanFrame.h"
    2121
    2222namespace pacpus {

  • trunk/CanGateway/CanGateway.cpp

    r1 r2  
    1313
    1414
    15 #include "kernel/ComponentFactory.h"
    16 #include "kernel/DbiteFileTypes.h"
     15#include "Pacpus/kernel/ComponentFactory.h"
     16#include "Pacpus/kernel/DbiteFileTypes.h"
    1717
    1818using namespace pacpus;

  • trunk/CanGateway/CanGateway.h

    r1 r2  
    2020#include "CanSubscription.h"
    2121
    22 #include "kernel/ComponentBase.h"
    23 #include "kernel/DbiteFile.h"
     22#include "Pacpus/kernel/ComponentBase.h"
     23#include "Pacpus/kernel/DbiteFile.h"
    2424#include "Win32CanInterface.h"
    2525

  • trunk/CanGateway/CanSubscription.cpp

    r1 r2  
    1 #include "kernel/ComponentManager.h"
     1#include "Pacpus/kernel/ComponentManager.h"
    22#include "CanSubscription.h"
    33

  • trunk/CanGateway/CanSubscription.h

    r1 r2  
    77#include "CanGatewayConfig.h"
    88#include "CanDecoderBase.h"
    9 
    10 #include "structure/structureCanCarmen.h"
    119
    1210

  • trunk/CanGateway/DbtRawCanReader.cpp

    r1 r2  
    1212
    1313
    14 #include "kernel/ComponentFactory.h"
    15 #include "kernel/DbiteFileTypes.h"
    16 #include "kernel/Log.h"
     14#include "Pacpus/kernel/ComponentFactory.h"
     15#include "Pacpus/kernel/DbiteFileTypes.h"
     16#include "Pacpus/kernel/Log.h"
    1717
    18 #include "kernel/road_time.h"
     18#include "Pacpus/kernel/road_time.h"
    1919
    2020using namespace pacpus;

  • trunk/CanGateway/DbtRawCanReader.h

    r1 r2  
    1616#include <QThread>
    1717
    18 #include "kernel/ComponentBase.h"
    19 #include "kernel/DbiteFile.h"
     18#include "Pacpus/kernel/ComponentBase.h"
     19#include "Pacpus/kernel/DbiteFile.h"
    2020
    2121using namespace pacpus;

  • trunk/CanGateway/Win32CanInterface.cpp

    r1 r2  
    1414#include "Win32CanInterface.h"
    1515
    16 #include "PacpusTools/ShMem.h"
     16#include "Pacpus/PacpusTools/ShMem.h"
    1717
    1818namespace pacpus {

  • trunk/CanGateway/Win32CanInterface.h

    r1 r2  
    2727#include <qthread.h>
    2828
    29 #include "../driver/CanDriver.h"
    30 #include "structure/structureCanCarmen.h"
     29#include "CanDecoderBase.h"
     30
     31#include "driver/CanDriver.h"
    3132
    3233namespace pacpus {

  • trunk/CanGateway/driver/CanDriverBase.h

    r1 r2  
    1717#define _CANDRIVERBASE_H_
    1818
    19 #include "kernel/road_time.h"
    20 #include "PacpusTools/BinaryDecoder.h"
    21 #include "structure/structureCanCarmen.h"
     19#include "Pacpus/kernel/road_time.h"
     20#include "Pacpus/PacpusTools/BinaryDecoder.h"
     21
    2222
    2323/*

  • trunk/CanGateway/driver/VectorCanDriver.cpp

    r1 r2  
    1818#include <stdio.h>
    1919#include <string>
    20 
     20#include "../CanFrame.h"
    2121
    2222#define WAIT_RECEIVING_FRAME_TIMEOUT 1000

  • trunk/CanGateway/driver/XLVectorCanDriver.cpp

    r1 r2  
    1111#include <string>
    1212
    13 #include "kernel/Log.h"
     13#include "Pacpus/kernel/Log.h"
     14#include "../CanFrame.h"
    1415
    1516using namespace pacpus;
Note: See TracChangeset for help on using the changeset viewer.