Changeset 302 in flair-src


Ignore:
Timestamp:
Feb 25, 2019, 4:28:34 PM (2 years ago)
Author:
Sanahuja Guillaume
Message:

modifs nouveau build system

Location:
trunk
Files:
49 added
1 deleted
66 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r298 r302  
    11PROJECT(Flair)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
    55
  • trunk/ReleaseNotes

    r282 r302  
    11* Actual Version:
    22
     3- new build system, now out of source; binaries are no longer provided in repositories
    34- corrected a bug with vrpn delta time calculation
    45
  • trunk/demos/CMakeLists.txt

    r299 r302  
    11PROJECT(FlairDemos)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/CircleFollower/)
  • trunk/demos/CircleFollower/simulator/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_SIMULATOR TRUE)
    65SET(FLAIR_USE_SIMULATOR_GL TRUE)
    7 SET(COPY_RESOURCE_FILES true)
    86
    9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    10 include(${FLAIR_USE_FILE})
     7include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    118
    129SET(SRC_FILES
     
    1411)
    1512
    16 INCLUDE_DIRECTORIES(
    17         ${FLAIR_INCLUDE_DIR}
     13FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     14           DEST_DIR CircleFollower
     15           COPY_RESOURCES
    1816)
    19 
    20 #real time executable
    21 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    22         ${SRC_FILES}
    23 )
    24 
    25 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    26 
    27 #non real time executable
    28 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    29         ${SRC_FILES}
    30 )
    31 
    32 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    33 
    34 INSTALL(
    35         TARGETS ${PROJECT_NAME}_rt
    36         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    37 )
    38 
    39 INSTALL(
    40         TARGETS ${PROJECT_NAME}_nrt
    41         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    42 )
  • trunk/demos/CircleFollower/simulator/resources/core2-64/simulator_x4.sh

    r301 r302  
    66fi
    77
    8 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     8. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    99
    10 $EXEC -n x4_0 -t x4 -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     10$EXEC -n x4_0 -t x4 -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/CircleFollower/simulator/resources/core2-64/simulator_x8.sh

    r301 r302  
    11#! /bin/bash
    22
    3 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     3. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    44
    55if [ -f /proc/xenomai/version ];then
     
    99fi
    1010
    11 $EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     11$EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/CircleFollower/uav/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    65SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     
    87SET(FLAIR_USE_META TRUE)
    98SET(FLAIR_USE_VRPN TRUE)
    10 SET(COPY_RESOURCE_FILES true)
    119
    12 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    13 include(${FLAIR_USE_FILE})
     10include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1411
    1512SET(SRC_FILES
     
    1815)
    1916
    20 INCLUDE_DIRECTORIES(
    21         ${FLAIR_INCLUDE_DIR}
     17FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     18           DEST_DIR CircleFollower
     19           COPY_RESOURCES
    2220)
    23 
    24 #real time executable
    25 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    26         ${SRC_FILES}
    27 )
    28 
    29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    30 
    31 #non real time executable
    32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    33         ${SRC_FILES}
    34 )
    35 
    36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    37 
    38 INSTALL(
    39         TARGETS ${PROJECT_NAME}_rt
    40         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    41 )
    42 
    43 INSTALL(
    44         TARGETS ${PROJECT_NAME}_nrt
    45         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    46 )
  • trunk/demos/CircleFollower/uav/resources/core2-64/x4.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu
  • trunk/demos/CircleFollower/uav/resources/core2-64/x8.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu
  • trunk/demos/Gps/simulator/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_SIMULATOR TRUE)
    65SET(FLAIR_USE_SIMULATOR_GL TRUE)
    7 SET(COPY_RESOURCE_FILES true)
    86
    9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    10 include(${FLAIR_USE_FILE})
     7include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    118
    129SET(SRC_FILES
     
    1411)
    1512
    16 INCLUDE_DIRECTORIES(
    17         ${FLAIR_INCLUDE_DIR}
     13FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     14           DEST_DIR Gps
     15           COPY_RESOURCES
    1816)
    19 
    20 #real time executable
    21 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    22         ${SRC_FILES}
    23 )
    24 
    25 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT} nmea)
    26 
    27 #non real time executable
    28 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    29         ${SRC_FILES}
    30 )
    31 
    32 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT} nmea)
    33 
    34 INSTALL(
    35         TARGETS ${PROJECT_NAME}_rt
    36         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    37 )
    38 
    39 INSTALL(
    40         TARGETS ${PROJECT_NAME}_nrt
    41         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    42 )
  • trunk/demos/Gps/simulator/resources/core2-64/simulator_x4.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    11 $EXEC -n x4_0 -t x4 -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     11$EXEC -n x4_0 -t x4 -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/Gps/simulator/resources/core2-64/simulator_x8.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    11 $EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     11$EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/Gps/uav/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    65SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
    76SET(FLAIR_USE_VISION_FILTER TRUE)
    87SET(FLAIR_USE_META TRUE)
    9 SET(COPY_RESOURCE_FILES true)
    108
    11 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    12 include(${FLAIR_USE_FILE})
     9include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1310
    1411SET(SRC_FILES
     
    1714)
    1815
    19 
    20 INCLUDE_DIRECTORIES(
    21         ${FLAIR_INCLUDE_DIR}
     16FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     17           DEST_DIR Gps
     18           COPY_RESOURCES
    2219)
    23 
    24 #real time executable
    25 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    26         ${SRC_FILES}
    27 )
    28 
    29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    30 
    31 #non real time executable
    32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    33         ${SRC_FILES}
    34 )
    35 
    36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    37 
    38 INSTALL(
    39         TARGETS ${PROJECT_NAME}_rt
    40         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    41 )
    42 
    43 INSTALL(
    44         TARGETS ${PROJECT_NAME}_nrt
    45         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    46 )
  • trunk/demos/Gps/uav/resources/core2-64/x4.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu
  • trunk/demos/Gps/uav/resources/core2-64/x8.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu
  • trunk/demos/HelloWorld/CMakeLists.txt

    r299 r302  
    88SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    99
    10 add_custom_target(
    11     delivery
    12     COMMAND make
    13     COMMAND scp bin/${PROJECT_NAME} root@192.168.6.1:/home/root/
    14 )
     10#add_custom_target(
     11#    delivery
     12#    COMMAND make
     13#    COMMAND scp bin/${PROJECT_NAME} root@192.168.147.63:/home/root/
     14#)
    1515
    1616INSTALL(
    1717        TARGETS ${PROJECT_NAME}
    18         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     18        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    1919)
  • trunk/demos/MixedReality/real/simulator/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_SIMULATOR TRUE)
    65SET(FLAIR_USE_SIMULATOR_GL TRUE)
    7 SET(COPY_RESOURCE_FILES true)
    86
    9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    10 include(${FLAIR_USE_FILE})
     7include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    118
    129if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")
     
    1613)
    1714
    18 INCLUDE_DIRECTORIES(
    19         ${FLAIR_INCLUDE_DIR}
    20 )
    21 
    22 #real time executable
    23 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    24         ${SRC_FILES}
    25 )
    26 
    27 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    28 
    29 #non real time executable
    30 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    31         ${SRC_FILES}
    32 )
    33 
    34 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    35 
    36 INSTALL(
    37         TARGETS ${PROJECT_NAME}_rt
    38         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    39 )
    40 
    41 INSTALL(
    42         TARGETS ${PROJECT_NAME}_nrt
    43         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     15FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     16           DEST_DIR MixedReality_real
     17           COPY_RESOURCES
    4418)
    4519
  • trunk/demos/MixedReality/real/simulator/resources/core2-64/simulator_x4.sh

    r301 r302  
    66fi
    77
    8 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     8. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    99
    10 $EXEC -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     10$EXEC -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/MixedReality/real/uav/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    65SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     
    87SET(FLAIR_USE_META TRUE)
    98SET(FLAIR_USE_VRPN TRUE)
    10 SET(COPY_RESOURCE_FILES true)
    11 
    12 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    13 include(${FLAIR_USE_FILE})
     9include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1410
    1511SET(SRC_FILES
     
    1814)
    1915
    20 INCLUDE_DIRECTORIES(
    21         ${FLAIR_INCLUDE_DIR}
     16FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     17           DEST_DIR MixedReality_real
     18           COPY_RESOURCES
    2219)
    23 
    24 #real time executable
    25 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    26         ${SRC_FILES}
    27 )
    28 
    29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    30 
    31 #non real time executable
    32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    33         ${SRC_FILES}
    34 )
    35 
    36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    37 
    38 INSTALL(
    39         TARGETS ${PROJECT_NAME}_rt
    40         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    41 )
    42 
    43 INSTALL(
    44         TARGETS ${PROJECT_NAME}_nrt
    45         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    46 )
  • trunk/demos/MixedReality/real/uav/resources/core2-64/x4.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu0 -v 127.0.0.1:3884
  • trunk/demos/MixedReality/virtual/simulator/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_SIMULATOR TRUE)
    65SET(FLAIR_USE_SIMULATOR_GL TRUE)
    76SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
    8 SET(COPY_RESOURCE_FILES true)
    97
    10 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    11 include(${FLAIR_USE_FILE})
     8include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    129
    1310if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")
     
    1714)
    1815
    19 INCLUDE_DIRECTORIES(
    20         ${FLAIR_INCLUDE_DIR}
    21 )
    22 
    23 #real time executable
    24 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    25         ${SRC_FILES}
    26 )
    27 
    28 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    29 
    30 #non real time executable
    31 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    32         ${SRC_FILES}
    33 )
    34 
    35 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    36 
    37 INSTALL(
    38         TARGETS ${PROJECT_NAME}_rt
    39         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    40 )
    41 
    42 INSTALL(
    43         TARGETS ${PROJECT_NAME}_nrt
    44         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     16FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     17           DEST_DIR MixedReality_virtual
     18           COPY_RESOURCES
    4519)
    4620
  • trunk/demos/MixedReality/virtual/simulator/resources/core2-64/simulator_x4.sh

    r301 r302  
    66fi
    77
    8 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     8. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    99
    10 $EXEC -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml -v 127.0.0.1:3883
     10$EXEC -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml -v 127.0.0.1:3883
  • trunk/demos/MixedReality/virtual/uav/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    65SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     
    87SET(FLAIR_USE_META TRUE)
    98SET(FLAIR_USE_VRPN TRUE)
    10 SET(COPY_RESOURCE_FILES true)
    119
    12 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    13 include(${FLAIR_USE_FILE})
     10include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1411
    1512if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")
     
    2017)
    2118
    22 INCLUDE_DIRECTORIES(
    23         ${FLAIR_INCLUDE_DIR}
    24 )
    25 
    26 #real time executable
    27 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    28         ${SRC_FILES}
    29 )
    30 
    31 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    32 
    33 #non real time executable
    34 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    35         ${SRC_FILES}
    36 )
    37 
    38 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    39 
    40 INSTALL(
    41         TARGETS ${PROJECT_NAME}_rt
    42         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    43 )
    44 
    45 INSTALL(
    46         TARGETS ${PROJECT_NAME}_nrt
    47         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     19FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     20           DEST_DIR MixedReality_virtual
     21           COPY_RESOURCES
    4822)
    4923
  • trunk/demos/MixedReality/virtual/uav/resources/core2-64/x4.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu0 -v 127.0.0.1:3884
  • trunk/demos/OpticalFlow/simulator/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_SIMULATOR TRUE)
    65SET(FLAIR_USE_SIMULATOR_GL TRUE)
    7 SET(COPY_RESOURCE_FILES true)
    86
    9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    10 include(${FLAIR_USE_FILE})
     7include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    118
    129SET(SRC_FILES
     
    1411)
    1512
    16 LINK_DIRECTORIES (
    17         ${FLAIR_LIBRARY_DIR}
     13FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     14           DEST_DIR OpticalFlow
     15           COPY_RESOURCES
    1816)
    19 
    20 INCLUDE_DIRECTORIES(
    21         ${FLAIR_INCLUDE_DIR}
    22 )
    23 
    24 #real time executable
    25 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    26         ${SRC_FILES}
    27 )
    28 
    29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    30 
    31 #non real time executable
    32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    33         ${SRC_FILES}
    34 )
    35 
    36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    37 
    38 INSTALL(
    39         TARGETS ${PROJECT_NAME}_rt
    40         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    41 )
    42 
    43 INSTALL(
    44         TARGETS ${PROJECT_NAME}_nrt
    45         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    46 )
  • trunk/demos/OpticalFlow/simulator/resources/core2-64/simulator_x4.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    11 $EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     11$EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/OpticalFlow/simulator/resources/core2-64/simulator_x8.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    11 $EXEC -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     11$EXEC -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/OpticalFlow/uav/CMakeLists.txt

    r301 r302  
    11PROJECT(OpticalFlow)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
    66
    7 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    87SET(FLAIR_USE_FILTER TRUE)
    98SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
    109SET(FLAIR_USE_VISION_FILTER TRUE)
    1110SET(FLAIR_USE_META TRUE)
    12 SET(COPY_RESOURCE_FILES true)
    13 
    14 include(${FLAIR_USE_FILE})
    1511
    1612SET(SRC_FILES
     
    1915)
    2016
    21 INCLUDE_DIRECTORIES(
    22         ${FLAIR_INCLUDE_DIR}
    23 )
    24 
    25 #real time executable
    26 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    27         ${SRC_FILES}
    28 )
    29 
    30 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    31 
    32 #non real time executable
    33 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    34         ${SRC_FILES}
    35 )
    36 
    37 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    38 
    39 INSTALL(
    40         TARGETS ${PROJECT_NAME}_rt
    41         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    42 )
    43 
    44 INSTALL(
    45         TARGETS ${PROJECT_NAME}_nrt
    46         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     17FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     18           DEST_DIR OpticalFlow
     19           COPY_RESOURCES
    4720)
    4821
  • trunk/demos/OpticalFlow/uav/resources/core2-64/x4.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu -v dsp_stub
  • trunk/demos/OpticalFlow/uav/resources/core2-64/x8.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x8.xml -t x8_simu -v dsp_stub
  • trunk/demos/PidStandalone/simulator/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_SIMULATOR TRUE)
    65SET(FLAIR_USE_SIMULATOR_GL TRUE)
    7 SET(COPY_RESOURCE_FILES true)
    86
    9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    10 include(${FLAIR_USE_FILE})
    11 
     7include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    128
    139SET(SRC_FILES
     
    1511)
    1612
    17 INCLUDE_DIRECTORIES(
    18         ${FLAIR_INCLUDE_DIR}
     13FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     14           DEST_DIR PidStandalone
     15           COPY_RESOURCES
    1916)
    20 
    21 #real time executable
    22 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    23         ${SRC_FILES}
    24 )
    25 
    26 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    27 
    28 #non real time executable
    29 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    30         ${SRC_FILES}
    31 )
    32 
    33 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    34 
    35 INSTALL(
    36         TARGETS ${PROJECT_NAME}_rt
    37         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    38 )
    39 
    40 INSTALL(
    41         TARGETS ${PROJECT_NAME}_nrt
    42         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    43 )
    44 
  • trunk/demos/PidStandalone/simulator/resources/core2-64/simulator_x4.sh

    r301 r302  
    77fi
    88
    9 . $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    11 $EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x simulator_x4.xml -o 10 -m $IGEP_ROOT/uav_dev/media -s $IGEP_ROOT/uav_dev/media/optitrack_b122.xml
     11$EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/PidStandalone/simulator/resources/core2-64/simulator_x8.sh

    r301 r302  
    77fi
    88
    9 . $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    11 $EXEC  -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $IGEP_ROOT/uav_dev/media -s $IGEP_ROOT/uav_dev/media/optitrack_b122.xml
     11$EXEC  -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/PidStandalone/uav/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    65SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
    76SET(FLAIR_USE_VISION_FILTER TRUE)
    87SET(FLAIR_USE_META TRUE)
    9 SET(COPY_RESOURCE_FILES true)
    108
    11 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    12 include(${FLAIR_USE_FILE})
     9include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1310
    1411SET(SRC_FILES
     
    1714)
    1815
    19 INCLUDE_DIRECTORIES(
    20         ${FLAIR_INCLUDE_DIR}
     16FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     17           DEST_DIR PidStandalone
     18           COPY_RESOURCES
    2119)
    22 
    23 #real time executable
    24 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    25         ${SRC_FILES}
    26 )
    27 
    28 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    29 
    30 #non real time executable
    31 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    32         ${SRC_FILES}
    33 )
    34 
    35 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    36 
    37 INSTALL(
    38         TARGETS ${PROJECT_NAME}_rt
    39         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    40 )
    41 
    42 INSTALL(
    43         TARGETS ${PROJECT_NAME}_nrt
    44         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    45 )
  • trunk/demos/PidStandalone/uav/resources/core2-64/x4.sh

    r301 r302  
    66fi
    77
    8 . $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
     8. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    99
    1010$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x4.xml -t x4_simu $*
  • trunk/demos/PidStandalone/uav/resources/core2-64/x8.sh

    r301 r302  
    77fi
    88
    9 . $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu
  • trunk/demos/SimpleFleet/simulator/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_SIMULATOR TRUE)
    65SET(FLAIR_USE_SIMULATOR_GL TRUE)
    7 SET(COPY_RESOURCE_FILES true)
    86
    9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    10 include(${FLAIR_USE_FILE})
     7include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    118
    129SET(SRC_FILES
     
    1411)
    1512
    16 INCLUDE_DIRECTORIES(
    17         ${FLAIR_INCLUDE_DIR}
     13FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     14           DEST_DIR SimpleFleet
     15           COPY_RESOURCES
    1816)
    19 
    20 #real time executable
    21 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    22         ${SRC_FILES}
    23 )
    24 
    25 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    26 
    27 #non real time executable
    28 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    29         ${SRC_FILES}
    30 )
    31 
    32 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    33 
    34 INSTALL(
    35         TARGETS ${PROJECT_NAME}_rt
    36         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    37 )
    38 
    39 INSTALL(
    40         TARGETS ${PROJECT_NAME}_nrt
    41         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    42 )
  • trunk/demos/SimpleFleet/simulator/resources/core2-64/simulator_x8.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    11 $EXEC -n x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     11$EXEC -n x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/SimpleFleet/uav/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    65SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     
    87SET(FLAIR_USE_META TRUE)
    98SET(FLAIR_USE_VRPN TRUE)
    10 SET(COPY_RESOURCE_FILES true)
    119
    12 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    13 include(${FLAIR_USE_FILE})
     10include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1411
    1512SET(SRC_FILES
     
    1815)
    1916
    20 INCLUDE_DIRECTORIES(
    21         ${FLAIR_INCLUDE_DIR}
     17FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     18           DEST_DIR SimpleFleet
     19           COPY_RESOURCES
    2220)
    23 
    24 #real time executable
    25 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    26         ${SRC_FILES}
    27 )
    28 
    29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    30 
    31 #non real time executable
    32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    33         ${SRC_FILES}
    34 )
    35 
    36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    37 
    38 INSTALL(
    39         TARGETS ${PROJECT_NAME}_rt
    40         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    41 )
    42 
    43 INSTALL(
    44         TARGETS ${PROJECT_NAME}_nrt
    45         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    46 )
  • trunk/demos/SimpleFleet/uav/resources/core2-64/x8_0.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu0 -b 127.255.255.255:20010
  • trunk/demos/SimpleFleet/uav/resources/core2-64/x8_1.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x8_1 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu1 -b 127.255.255.255:20010 -d 21000
  • trunk/demos/Sinus/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    6 SET(COPY_RESOURCE_FILES true)
    75
    8 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    9 include(${FLAIR_USE_FILE})
     6include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    107
    118SET(SRC_FILES
     
    1613)
    1714
    18 LINK_DIRECTORIES (
    19         ${FLAIR_LIBRARY_DIR}
     15FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     16           DEST_DIR Sinus
     17           COPY_RESOURCES
    2018)
    21 
    22 INCLUDE_DIRECTORIES(
    23         ${FLAIR_INCLUDE_DIR}
    24 )
    25 
    26 #real time executable
    27 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    28         ${SRC_FILES}
    29 )
    30 
    31 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    32 
    33 #non real time executable
    34 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    35         ${SRC_FILES}
    36 )
    37 
    38 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    39 
    40 INSTALL(
    41         TARGETS ${PROJECT_NAME}_rt
    42         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    43 )
    44 
    45 INSTALL(
    46         TARGETS ${PROJECT_NAME}_nrt
    47         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    48 )
  • trunk/demos/Sinus/resources/core2-64/Sinus.sh

    r301 r302  
    66fi
    77
    8 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     8. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    99
    1010$EXEC
  • trunk/demos/Skeletons/CustomReferenceAngles/CMakeLists.txt

    r297 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    65SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     
    87SET(FLAIR_USE_META TRUE)
    98
    10 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    11 include(${FLAIR_USE_FILE})
     9include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1210
    1311SET(SRC_FILES
     
    1614)
    1715
    18 INCLUDE_DIRECTORIES(
    19         ${FLAIR_INCLUDE_DIR}
    20 )
    21 
    22 #real time executable
    23 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    24         ${SRC_FILES}
    25 )
    26 
    27 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    28 
    29 #non real time executable
    30 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    31         ${SRC_FILES}
    32 )
    33 
    34 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     16FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}")
  • trunk/demos/Skeletons/CustomTorques/CMakeLists.txt

    r297 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    65SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     
    87SET(FLAIR_USE_META TRUE)
    98
    10 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    11 include(${FLAIR_USE_FILE})
     9include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1210
    1311SET(SRC_FILES
     
    1614)
    1715
    18 INCLUDE_DIRECTORIES(
    19         ${FLAIR_INCLUDE_DIR}
    20 )
    21 
    22 #real time executable
    23 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    24         ${SRC_FILES}
    25 )
    26 
    27 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    28 
    29 #non real time executable
    30 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    31         ${SRC_FILES}
    32 )
    33 
    34 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     16FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}")
  • trunk/lib/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairLibs)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/FlairCore)
  • trunk/lib/Doxyfile.in

    r22 r302  
    5353# where doxygen was started. If left blank the current directory will be used.
    5454
    55 OUTPUT_DIRECTORY       = $(FLAIR_ROOT)/flair-dev/doc
     55OUTPUT_DIRECTORY       = $(FLAIR_ROOT)/flair-install/doc
    5656
    5757# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
  • trunk/lib/FlairCore/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairCore)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55find_package(LibXml2 REQUIRED)
    6 
    7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    8                 OUTPUT_VARIABLE GCC_VERSION)
    9 
    10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    11         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    12                 ADD_DEFINITIONS("-std=c++11")
    13         else()
    14                 ADD_DEFINITIONS("-std=c++0x")
    15         endif()
    16 else()
    17         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    18 endif()
    196
    207FILE(GLOB FLAIRCORE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
     
    2916
    3017add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/nrt)
    31 if(NOT WIN32)
    3218add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rt)
    33 endif()
    34 
    35 add_custom_target(
    36         ${PROJECT_NAME}_compile_info
    37         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    38 )
    39 
    40 add_dependencies(FlairCore_rt ${PROJECT_NAME}_compile_info)
    41 add_dependencies(FlairCore_nrt ${PROJECT_NAME}_compile_info)
  • trunk/lib/FlairCore/nrt/CMakeLists.txt

    r2 r302  
    33ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT)
    44
    5 ADD_LIBRARY(${PROJECT_NAME}
    6         ${FLAIRCORE_SRC}
    7 )
     5FLAIR_LIB(${PROJECT_NAME} "${FLAIRCORE_SRC}")
    86
    9 INSTALL(TARGETS ${PROJECT_NAME}
    10         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    11         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    12 )
     7#install here, as FLAIR_LIB function will not find .h (in ../src)
     8FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h")
     9INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-install/include/FlairCore)
  • trunk/lib/FlairCore/rt/CMakeLists.txt

    r2 r302  
    88)
    99
    10 ADD_LIBRARY(${PROJECT_NAME}
    11         ${FLAIRCORE_SRC}
    12 )
     10FLAIR_LIB(${PROJECT_NAME} "${FLAIRCORE_SRC}")
    1311
    14 INSTALL(TARGETS ${PROJECT_NAME}
    15         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    16         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    17 )
    18 
    19 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h")
    20 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/FlairCore)
  • trunk/lib/FlairCore/src/Widget.h

    r67 r302  
    1515
    1616#include <Object.h>
    17 //#include <io_data.h>
    18 #include <libxml/xpath.h>
    1917
    2018class Widget_impl;
    2119class FrameworkManager_impl;
     20typedef struct _xmlNode xmlNode;
     21typedef xmlNode *xmlNodePtr;
    2222
    2323namespace flair {
  • trunk/lib/FlairFilter/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairFilter)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    4 
    5 find_package(LibXml2 REQUIRED)
    6 
    7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    8                 OUTPUT_VARIABLE GCC_VERSION)
    9 
    10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    11         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    12                 ADD_DEFINITIONS("-std=c++11")
    13         else()
    14                 ADD_DEFINITIONS("-std=c++0x")
    15         endif()
    16 else()
    17         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    18 endif()
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    194
    205INCLUDE_DIRECTORIES(
    21         ${LIBXML2_INCLUDE_DIR}
    226        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src
    237        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairSensorActuator/src
     
    3014FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    3115
    32 ADD_LIBRARY(${PROJECT_NAME}
    33         ${SRC_FILES}
     16FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}"
     17        INCLUDES_DEST_DIR ${PROJECT_NAME}
    3418)
    35 
    36 INSTALL(TARGETS ${PROJECT_NAME}
    37         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    38         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    39 )
    40 
    41 #copie des entetes
    42 FILE(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
    43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
    44 
    45 add_custom_target(
    46         ${PROJECT_NAME}_compile_info
    47         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    48 )
    49 
    50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
  • trunk/lib/FlairMeta/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairMeta)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    4 
    5 find_package(LibXml2 REQUIRED)
    6 
    7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    8                 OUTPUT_VARIABLE GCC_VERSION)
    9 
    10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    11         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    12                 ADD_DEFINITIONS("-std=c++11")
    13         else()
    14                 ADD_DEFINITIONS("-std=c++0x")
    15         endif()
    16 else()
    17         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    18 endif()
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    194
    205INCLUDE_DIRECTORIES(
    21         ${LIBXML2_INCLUDE_DIR}
    226        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src
    237        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairSensorActuator/src
     
    3014FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    3115
    32 ADD_LIBRARY(${PROJECT_NAME}
    33         ${SRC_FILES}
     16FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}"
     17        INCLUDES_DEST_DIR ${PROJECT_NAME}
    3418)
    35 
    36 INSTALL(TARGETS ${PROJECT_NAME}
    37         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    38         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    39 )
    40 
    41 #copie des entetes
    42 FILE(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
    43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
    44 
    45 add_custom_target(
    46         ${PROJECT_NAME}_compile_info
    47         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    48 )
    49 
    50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
  • trunk/lib/FlairSensorActuator/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairSensorActuator)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    4 
    5 find_package(LibXml2 REQUIRED)
    6 
    7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    8                 OUTPUT_VARIABLE GCC_VERSION)
    9 
    10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    11         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    12                 ADD_DEFINITIONS("-std=c++11")
    13         else()
    14                 ADD_DEFINITIONS("-std=c++0x")
    15         endif()
    16 else()
    17         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    18 endif()
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    194
    205INCLUDE_DIRECTORIES(
    21         ${LIBXML2_INCLUDE_DIR}
    226        ${CMAKE_CURRENT_SOURCE_DIR}/src
    237        ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported
     
    2812)
    2913
    30 FILE(GLOB SENSOR_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
     14FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    3115
    32 ADD_LIBRARY(${PROJECT_NAME}
    33         ${SENSOR_SRC}
     16FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}"
     17        INCLUDES_DEST_DIR ${PROJECT_NAME}
    3418)
    35 
    36 INSTALL(TARGETS ${PROJECT_NAME}
    37         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    38         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    39 )
    40 
    41 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
    42 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
    43 
    44 add_custom_target(
    45         ${PROJECT_NAME}_compile_info
    46         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    47 )
    48 
    49 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
  • trunk/lib/FlairSimulator/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairSimulator)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55find_package(LibXml2 REQUIRED)
    66
    7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    8                 OUTPUT_VARIABLE GCC_VERSION)
    9 
    10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    11         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    12                 ADD_DEFINITIONS("-std=c++11")
    13         else()
    14                 ADD_DEFINITIONS("-std=c++0x")
    15         endif()
    16 else()
    17         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    18 endif()
    19 
    207INCLUDE_DIRECTORIES(
    21         ${LIBXML2_INCLUDE_DIR}
     8        ${LIBXML2_INCLUDE_DIR}
    229        ${CMAKE_CURRENT_SOURCE_DIR}/src
    2310        ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported
     
    2916)
    3017
    31 FILE(GLOB SIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    32 
    33 add_custom_target(
    34         ${PROJECT_NAME}_compile_info
    35         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    36 )
     18FILE(GLOB FLAIRSIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    3719
    3820add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/no_gl)
    39 add_dependencies(FlairSimulator_nogl ${PROJECT_NAME}_compile_info)
    4021if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
    4122add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gl)
    42 add_dependencies(FlairSimulator_gl ${PROJECT_NAME}_compile_info)
    4323endif()
  • trunk/lib/FlairSimulator/gl/CMakeLists.txt

    r8 r302  
    33ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT -DGL)
    44
    5 
    6 ADD_LIBRARY(${PROJECT_NAME}
    7         ${SIMU_SRC}
    8 )
    9 
    10 INSTALL(TARGETS ${PROJECT_NAME}
    11         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    12         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    13 )
     5FLAIR_LIB(${PROJECT_NAME} "${FLAIRSIMU_SRC}")
  • trunk/lib/FlairSimulator/no_gl/CMakeLists.txt

    r8 r302  
    33ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT)
    44
    5 ADD_LIBRARY(${PROJECT_NAME}
    6         ${SIMU_SRC}
    7 )
     5FLAIR_LIB(${PROJECT_NAME} "${FLAIRSIMU_SRC}")
    86
    9 INSTALL(TARGETS ${PROJECT_NAME}
    10         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    11         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    12 )
    13 
     7#install here, as FLAIR_LIB function will not find .h (in ../src)
    148FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h")
    15 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/FlairSimulator)
     9INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-install/include/FlairSimulator)
  • trunk/lib/FlairSimulator/src/Parser.cpp

    r167 r302  
    2727#include <IGeometryCreator.h>
    2828#include <ISceneManager.h>
     29#include <libxml/parser.h>
     30#include <libxml/tree.h>
    2931
    3032using namespace irr;
  • trunk/lib/FlairSimulator/src/Parser.h

    r167 r302  
    2020#include <Gui.h>
    2121#include <Vector3D.h>
    22 #include <libxml/parser.h>
    23 #include <libxml/tree.h>
    2422#include <SColor.h>
     23
     24//todo make a pimpl to remove these forward declaration
     25typedef struct _xmlNode xmlNode;
     26typedef unsigned char xmlChar;
     27typedef struct _xmlDoc xmlDoc;
    2528
    2629namespace flair {
  • trunk/lib/FlairVisionFilter/CMakeLists.txt

    r300 r302  
    11PROJECT(FlairVisionFilter)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    4 
    5 #if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
    6 
    7 find_package(LibXml2 REQUIRED)
    8 
    9 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
    10                 OUTPUT_VARIABLE GCC_VERSION)
    11 
    12 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
    13         if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
    14                 ADD_DEFINITIONS("-std=c++11")
    15         else()
    16                 ADD_DEFINITIONS("-std=c++0x")
    17         endif()
    18 else()
    19         message(STATUS "GCC version < 4.3, c+11 is not supported!")
    20 endif()
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    214
    225INCLUDE_DIRECTORIES(
    23         ${LIBXML2_INCLUDE_DIR}
    246        ${CMAKE_CURRENT_SOURCE_DIR}/src
    25         ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported
    267        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src
    278    ${CMAKE_CURRENT_SOURCE_DIR}/../FlairFilter/src
     
    2910)
    3011
    31 FILE(GLOB SRC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
     12FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    3213
    33 ADD_LIBRARY(${PROJECT_NAME}
    34         ${SRC_SRC}
     14FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}"
     15        INCLUDES_DEST_DIR ${PROJECT_NAME}
    3516)
    36 
    37 INSTALL(TARGETS ${PROJECT_NAME}
    38         LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    39         ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
    40 )
    41 
    42 FILE(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
    43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
    44 
    45 add_custom_target(
    46         ${PROJECT_NAME}_compile_info
    47         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
    48 )
    49 
    50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
    51 
    52 #else()
    53 #    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
    54 #        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE} architecture")
    55 #    else()
    56 #        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
    57 #    endif()
    58 #endif()
  • trunk/tools/CMakeLists.txt

    r297 r302  
    11PROJECT(FlairTools)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Controller/DualShock3)
  • trunk/tools/Controller/DualShock3/CMakeLists.txt

    r107 r302  
    11PROJECT(dualshock3)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
    66
    77SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
    8 include(${FLAIR_USE_FILE})
    98
    109ADD_DEFINITIONS(-fpermissive)
    1110
    12 INCLUDE_DIRECTORIES(
    13         ${FLAIR_INCLUDE_DIR}
    14         ${CMAKE_SOURCE_DIR}/src
    15 )
    16 
    17 LINK_DIRECTORIES (
    18         ${FLAIR_LIBRARY_DIR}
    19 )
    20 
    21 ADD_EXECUTABLE(${PROJECT_NAME}
     11SET(SRC_FILES
    2212        src/DualShock3.cpp
    2313        src/main.cpp
    2414)
    2515
    26 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${FLAIR_LIBRARIES_NRT} bluetooth usb)
     16FLAIR_NRT_TOOL(${PROJECT_NAME} "${SRC_FILES}")
    2717
    28 INSTALL(
    29         TARGETS ${PROJECT_NAME}
    30         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/tools/${ARCH_DIR}
    31 )
    32 
    33 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
     18TARGET_LINK_LIBRARIES(${PROJECT_NAME} bluetooth usb)
    3419
    3520else()
  • trunk/tools/Controller/Mavlink/CMakeLists.txt

    r107 r302  
    11PROJECT(MavPlanner)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
    66
    7 include(${FLAIR_USE_FILE})
    8 
    9 ADD_DEFINITIONS(-fpermissive)
    10 
    117INCLUDE_DIRECTORIES(
    12         ${FLAIR_INCLUDE_DIR}
    13         ${CMAKE_SOURCE_DIR}/src
    148        ${CMAKE_SOURCE_DIR}/src/mavlink_generated_messages/common
    159)
     
    1711FILE(GLOB MAVPLANNER_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
    1812
    19 ADD_EXECUTABLE(${PROJECT_NAME}
    20         ${MAVPLANNER_SRC}
    21 )
    22 
    23 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${FLAIR_LIBRARIES_NRT})
    24 
    25 INSTALL(
    26         TARGETS ${PROJECT_NAME}
    27         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/tools/${ARCH_DIR}
    28 )
    29 
    30 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
     13FLAIR_NRT_TOOL(${PROJECT_NAME} "${MAVPLANNER_SRC}")
    3114
    3215else()
  • trunk/tools/Dbt2csv/CMakeLists.txt

    r234 r302  
    11PROJECT(dbt2csv)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
     
    2929        ../FlairGCS/src/
    3030        ${QT_INCLUDE_DIR}
     31    ${CMAKE_BINARY_DIR}/generated/
    3132)
    3233
     
    4041INSTALL(
    4142        TARGETS ${PROJECT_NAME}
    42         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/tools/${ARCH_DIR}
     43        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/tools/${ARCH_DIR}
    4344)
    4445
    4546add_custom_target(
    4647        compile_info
    47         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
     48        COMMAND $ENV{FLAIR_ROOT}/flair-src/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/generated/compile_info.h
    4849)
    4950
  • trunk/tools/FlairGCS/CMakeLists.txt

    r297 r302  
    11PROJECT(flairgcs)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
     
    6565        ${CMAKE_SYSROOT}/usr/include/qt4/QtMobility
    6666        ${CMAKE_SYSROOT}/usr/include/qt4/QtLocation
     67    ${CMAKE_BINARY_DIR}/generated/
    6768)
    6869
     
    7677INSTALL(
    7778        TARGETS ${PROJECT_NAME}
    78         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/tools/${ARCH_DIR}
     79        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/bin/tools/${ARCH_DIR}
    7980)
    8081
    8182add_custom_target(
    8283        ${PROJECT_NAME}_compile_info
    83         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
     84        COMMAND $ENV{FLAIR_ROOT}/flair-src/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/generated/compile_info.h
    8485)
    8586
  • trunk/tools/VrpnBridge/CMakeLists.txt

    r232 r302  
    11PROJECT(vrnbridge)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
     
    1818INSTALL(
    1919        TARGETS ${PROJECT_NAME}
    20         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/tools/${ARCH_DIR}
     20        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/bin/tools/${ARCH_DIR}
    2121)
    2222
Note: See TracChangeset for help on using the changeset viewer.