Index: trunk/demos/OpticalFlow/simulator/CMakeLists.txt
===================================================================
--- trunk/demos/OpticalFlow/simulator/CMakeLists.txt	(revision 301)
+++ trunk/demos/OpticalFlow/simulator/CMakeLists.txt	(revision 302)
@@ -2,11 +2,8 @@
 cmake_minimum_required(VERSION 2.8)
 
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 SET(FLAIR_USE_SIMULATOR TRUE)
 SET(FLAIR_USE_SIMULATOR_GL TRUE)
-SET(COPY_RESOURCE_FILES true)
 
-include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
-include(${FLAIR_USE_FILE})
+include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
 
 SET(SRC_FILES
@@ -14,33 +11,6 @@
 )
 
-LINK_DIRECTORIES (
-	${FLAIR_LIBRARY_DIR}
+FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
+           DEST_DIR OpticalFlow
+           COPY_RESOURCES
 )
-
-INCLUDE_DIRECTORIES(
-	${FLAIR_INCLUDE_DIR}
-)
-
-#real time executable
-ADD_EXECUTABLE(${PROJECT_NAME}_rt
-	${SRC_FILES}
-)
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
-
-#non real time executable
-ADD_EXECUTABLE(${PROJECT_NAME}_nrt
-	${SRC_FILES}
-)
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
-
-INSTALL(
-	TARGETS ${PROJECT_NAME}_rt
-	RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
-)
-
-INSTALL(
-	TARGETS ${PROJECT_NAME}_nrt
-	RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
-)
Index: trunk/demos/OpticalFlow/simulator/resources/core2-64/simulator_x4.sh
===================================================================
--- trunk/demos/OpticalFlow/simulator/resources/core2-64/simulator_x4.sh	(revision 301)
+++ trunk/demos/OpticalFlow/simulator/resources/core2-64/simulator_x4.sh	(revision 302)
@@ -7,5 +7,5 @@
 fi
 
-. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
 
-$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
+$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
Index: trunk/demos/OpticalFlow/simulator/resources/core2-64/simulator_x8.sh
===================================================================
--- trunk/demos/OpticalFlow/simulator/resources/core2-64/simulator_x8.sh	(revision 301)
+++ trunk/demos/OpticalFlow/simulator/resources/core2-64/simulator_x8.sh	(revision 302)
@@ -7,5 +7,5 @@
 fi
 
-. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
 
-$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
+$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
Index: trunk/demos/OpticalFlow/uav/CMakeLists.txt
===================================================================
--- trunk/demos/OpticalFlow/uav/CMakeLists.txt	(revision 301)
+++ trunk/demos/OpticalFlow/uav/CMakeLists.txt	(revision 302)
@@ -1,16 +1,12 @@
 PROJECT(OpticalFlow)
 cmake_minimum_required(VERSION 2.8)
-include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
 
 if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
 
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 SET(FLAIR_USE_FILTER TRUE)
 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
 SET(FLAIR_USE_VISION_FILTER TRUE)
 SET(FLAIR_USE_META TRUE)
-SET(COPY_RESOURCE_FILES true)
-
-include(${FLAIR_USE_FILE})
 
 SET(SRC_FILES
@@ -19,30 +15,7 @@
 )
 
-INCLUDE_DIRECTORIES(
-	${FLAIR_INCLUDE_DIR}
-)
-
-#real time executable
-ADD_EXECUTABLE(${PROJECT_NAME}_rt
-	${SRC_FILES}
-)
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
-
-#non real time executable
-ADD_EXECUTABLE(${PROJECT_NAME}_nrt
-	${SRC_FILES}
-)
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
-
-INSTALL(
-	TARGETS ${PROJECT_NAME}_rt
-	RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
-)
-
-INSTALL(
-	TARGETS ${PROJECT_NAME}_nrt
-	RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
+FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
+           DEST_DIR OpticalFlow
+           COPY_RESOURCES
 )
 
Index: trunk/demos/OpticalFlow/uav/resources/core2-64/x4.sh
===================================================================
--- trunk/demos/OpticalFlow/uav/resources/core2-64/x4.sh	(revision 301)
+++ trunk/demos/OpticalFlow/uav/resources/core2-64/x4.sh	(revision 302)
@@ -7,5 +7,5 @@
 fi
 
-. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
 
 $EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu -v dsp_stub
Index: trunk/demos/OpticalFlow/uav/resources/core2-64/x8.sh
===================================================================
--- trunk/demos/OpticalFlow/uav/resources/core2-64/x8.sh	(revision 301)
+++ trunk/demos/OpticalFlow/uav/resources/core2-64/x8.sh	(revision 302)
@@ -7,5 +7,5 @@
 fi
 
-. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
 
 $EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x8.xml -t x8_simu -v dsp_stub
