Changeset 302 in flair-src for trunk/demos/Skeletons


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

modifs nouveau build system

Location:
trunk/demos/Skeletons
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • 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}")
Note: See TracChangeset for help on using the changeset viewer.