Changeset 105 in flair-src for trunk/demos/PidStandalone/simulator

Timestamp:

10/18/16 09:13:08 (8 years ago)

Author:

Bayard Gildas

Message:

Passage du "framework" à flair

Location:

trunk/demos/PidStandalone/simulator

Files:

• CMakeLists.txt (modified) (4 diffs)
• src/main.cpp (modified) (1 diff)

trunk/demos/PidStandalone/simulator/CMakeLists.txt

@@ -3 +3 @@
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-SET(FRAMEWORK_USE_SIMULATOR TRUE)
-SET(FRAMEWORK_USE_SIMULATOR_GL TRUE)
+SET(FLAIR_USE_SIMULATOR TRUE)
+SET(FLAIR_USE_SIMULATOR_GL TRUE)
 
-include($ENV{IGEP_ROOT}/uav_dev/cmake_modules/GlobalCmakeUAV.cmake)
-include(${FRAMEWORK_USE_FILE})
+include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+include(${FLAIR_USE_FILE})
 
 SET(SRC_FILES
@@ -13 +13 @@
 )
 
-LINK_DIRECTORIES (
-        ${FRAMEWORK_LIBRARY_DIR}
-)
-
 INCLUDE_DIRECTORIES(
-        ${FRAMEWORK_INCLUDE_DIR}
+        ${FLAIR_INCLUDE_DIR}
 )
 
@@ -26 +22 @@
 )
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FRAMEWORK_LIBRARIES_RT})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
 
 #non real time executable
@@ -33 +29 @@
 )
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FRAMEWORK_LIBRARIES_NRT})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})

trunk/demos/PidStandalone/simulator/src/main.cpp

@@ -26 +26 @@
 using namespace TCLAP;
 using namespace std;
-using namespace framework::simulator;
-using namespace framework::sensor;
+using namespace flair::simulator;
+using namespace flair::sensor;
 
 int port;