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

Timestamp:

Jan 6, 2017, 1:58:28 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/cmake-modules

Files:

• FlairUseFile.cmake (modified) (3 diffs)
• GlobalCmakeFlair.cmake (modified) (1 diff)

trunk/cmake-modules/FlairUseFile.cmake

@@ -32 +32 @@
         udt pthread cv cxcore highgui FileLib rt z
 )
+
+#auto select dependencies
+IF (FLAIR_USE_SIMULATOR)
+        SET(FLAIR_USE_VRPN TRUE)
+ENDIF (FLAIR_USE_SIMULATOR)
 
 #VRPN for motion capture
@@ -73 +78 @@
                 ${CMAKE_SYSROOT}/usr/include/irrlicht
                 ${FLAIR_DEV}/include/FlairSensorActuator
-                ${CMAKE_SYSROOT}/usr/include/vrpn
                 )
         
@@ -80 +84 @@
                 ADD_DEFINITIONS("-DGL")
                 SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_gl.a
-                         ${SIMU_LIBRARY} GL vrpn ${FLAIR_LIBRARIES} Irrlicht Xxf86vm)
+                         ${SIMU_LIBRARY} GL ${FLAIR_LIBRARIES} Irrlicht Xxf86vm)
         else()
-                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_nogl.a ${SIMU_LIBRARY} vrpn ${FLAIR_LIBRARIES})
+                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_nogl.a ${SIMU_LIBRARY} ${FLAIR_LIBRARIES})
         endif()
 ENDIF (FLAIR_USE_SIMULATOR)

trunk/cmake-modules/GlobalCmakeFlair.cmake

@@ -62 +62 @@
                                         string(REPLACE "/" "_" TARGET_PATH ${TARGET_EXECUTABLE_OUTPUT_PATH})#les / ne sont pas acceptés
                                         add_custom_target(
-                                            delivery_root@${ADDRESS}_${TARGET_PATH}_${ARGV0}
+                                            delivery_root_${ADDRESS}_${TARGET_PATH}_${ARGV0}
                                             COMMAND make
                                             COMMAND scp ${EXECUTABLE_OUTPUT_PATH}/${ARGV0} root@${ADDRESS}:${TARGET_EXECUTABLE_OUTPUT_PATH}