Changeset 44 in flair-dev for trunk/cmake-modules


Ignore:
Timestamp:
Jan 6, 2017, 1:58:28 PM (5 years ago)
Author:
Sanahuja Guillaume
Message:

m

Location:
trunk/cmake-modules
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/cmake-modules/FlairUseFile.cmake

    r27 r44  
    3232        udt pthread cv cxcore highgui FileLib rt z
    3333)
     34
     35#auto select dependencies
     36IF (FLAIR_USE_SIMULATOR)
     37        SET(FLAIR_USE_VRPN TRUE)
     38ENDIF (FLAIR_USE_SIMULATOR)
    3439
    3540#VRPN for motion capture
     
    7378                ${CMAKE_SYSROOT}/usr/include/irrlicht
    7479                ${FLAIR_DEV}/include/FlairSensorActuator
    75                 ${CMAKE_SYSROOT}/usr/include/vrpn
    7680                )
    7781       
     
    8084                ADD_DEFINITIONS("-DGL")
    8185                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_gl.a
    82                          ${SIMU_LIBRARY} GL vrpn ${FLAIR_LIBRARIES} Irrlicht Xxf86vm)
     86                         ${SIMU_LIBRARY} GL ${FLAIR_LIBRARIES} Irrlicht Xxf86vm)
    8387        else()
    84                 SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_nogl.a ${SIMU_LIBRARY} vrpn ${FLAIR_LIBRARIES})
     88                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_nogl.a ${SIMU_LIBRARY} ${FLAIR_LIBRARIES})
    8589        endif()
    8690ENDIF (FLAIR_USE_SIMULATOR)
  • trunk/cmake-modules/GlobalCmakeFlair.cmake

    r10 r44  
    6262                                        string(REPLACE "/" "_" TARGET_PATH ${TARGET_EXECUTABLE_OUTPUT_PATH})#les / ne sont pas acceptés
    6363                                        add_custom_target(
    64                                             delivery_root@${ADDRESS}_${TARGET_PATH}_${ARGV0}
     64                                            delivery_root_${ADDRESS}_${TARGET_PATH}_${ARGV0}
    6565                                            COMMAND make
    6666                                            COMMAND scp ${EXECUTABLE_OUTPUT_PATH}/${ARGV0} root@${ADDRESS}:${TARGET_EXECUTABLE_OUTPUT_PATH}
Note: See TracChangeset for help on using the changeset viewer.