Changeset 45 in pacpussensors


Ignore:
Timestamp:
04/17/14 17:52:29 (10 years ago)
Author:
DHERBOMEZ Gérald
Message:

Some modifications of build environment for Linux

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r37 r45  
    2121set(PacpusSensors_VERSION
    2222    "${PacpusSensors_MAJOR_VERSION}.${PacpusSensors_MINOR_VERSION}.${PacpusSensors_PATCH_VERSION}")
    23 
    24 # ========================================
    25 # CMake variables
    26 # ========================================
    27 #set(PacpusSensors_ROOT_DIR         ${CMAKE_SOURCE_DIR})
    28 #set(PacpusSensors_CMAKE_DIR        ${PacpusSensors_ROOT_DIR}/cmake)
    29 #set(PacpusSensors_DOC_DIR          ${PacpusSensors_ROOT_DIR}/doc)
    30 #set(PacpusSensors_INCLUDE_DIR      ${PacpusSensors_ROOT_DIR}/include)
    31 set(PACPUS_INCLUDE_DIR      ${PACPUS_ROOT_DIR}/include)
    3223
    3324# ========================================
    … …  
    9283# Build the PacpusSensors' modules
    9384# ========================================
    94 #add_subdirectory(Alasca)
     85add_subdirectory(Alasca)
    9586#add_subdirectory(CanGateway)
    96 add_subdirectory(StdDbtPlayerComponents)
    97 #add_subdirectory(Dualshock)
     87#add_subdirectory(StdDbtPlayerComponents)
     88# add_subdirectory(Dualshock)
    9889#add_subdirectory(Wifibot)
    99 #add_subdirectory(PacpusSocket)
     90add_subdirectory(PacpusSocket)
    10091add_subdirectory(Sick)
    10192

  • trunk/CanGateway/CMakeLists.txt

    r31 r45  
    150150# Install
    151151# ========================================
     152# install plugin
    152153pacpus_install(${PROJECT_NAME})
     154# install headers
     155install(
     156    DIRECTORY
     157        ${CanGateway_SOURCE_DIR}
     158    DESTINATION
     159        ${PACPUS_INSTALL_DIR}/include
     160)
     161# if WIN32 install driver dependencies
     162
     163
     164‫sta#

  • trunk/Sick/XML/SickConfig.xml

    r43 r45  
    77    </components>
    88    <parameters>
    9         <plugins list="libSick.so" />
     9        <plugins list="../lib/libSick.so" />
    1010    </parameters>
    1111</pacpus>
    … …  
    2020    </components>
    2121    <parameters>
    22         <plugins list="libSick.so" />
     22        <plugins list="../lib/libSick.so" />
    2323    </parameters>
    2424</pacpus>

  • trunk/build/build_linux.sh

    r5 r45  
    1 #!/bin/sh
     1#!/bin/bash
    22
    33set -e
    44
    5 BUILD_DIR=./build
    6 if [ -z $1 ]; then J="1"; else J="$1"; fi
     5if [ -z $PACPUS_ROOT ]; then
     6        echo PACPUS_ROOT environment variable does not exist, please set it the folder in which you have installed pacpusframework.
     7else
    78
    8 if [ "$TARGET_PREFIX" == "arm-poky-linux-gnueabi-" ]; then
    9     echo The environment is configured for poky_arm
    10     exit 1
     9        BUILD_DIR=./build${PACPUS_ROOT////_}
     10        echo Your files will be built in: $BUILD_DIR
     11
     12        if [ -z $1 ]; then J="1"; else J="$1";
     13        fi
     14
     15        if [ "$TARGET_PREFIX" == "arm-poky-linux-gnueabi-" ]; then
     16                echo The environment is configured for poky_arm
     17                exit 1
     18        fi
     19
     20        if [ -d "$BUILD_DIR" ]; then
     21                rm -rf $BUILD_DIR
     22        fi
     23
     24        mkdir $BUILD_DIR
     25        cd $BUILD_DIR
     26
     27        cmake ../..
     28
     29        make -j$J
     30        sudo make install
     31
    1132fi
    1233
    13 if [ -d "$BUILD_DIR" ]; then
    14     rm -rf $BUILD_DIR
    15 fi
    16 
    17 mkdir $BUILD_DIR
    18 cd $BUILD_DIR
    19 
    20 cmake ../..
    21 
    22 make -j$J
    23 sudo make install
    24 
    25 
Note: See TracChangeset for help on using the changeset viewer.