Changeset 302 in flair-src for trunk/tools


Ignore:
Timestamp:
02/25/19 16:28:34 (3 years ago)
Author:
Sanahuja Guillaume
Message:

modifs nouveau build system

Location:
trunk/tools
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • 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.