Changeset 297 in flair-src for trunk

Timestamp:

Jan 28, 2019, 5:22:21 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

going to out of source build

Location:

trunk

Files:

• CMakeLists.txt (added)
• demos/CMakeLists.txt (added)
• demos/CircleFollower/simulator/CMakeLists.txt (modified) (1 diff)
• demos/CircleFollower/uav/CMakeLists.txt (modified) (1 diff)
• demos/Gps/simulator/CMakeLists.txt (modified) (1 diff)
• demos/Gps/uav/CMakeLists.txt (modified) (1 diff)
• demos/MixedReality/real/simulator/CMakeLists.txt (modified) (1 diff)
• demos/MixedReality/real/uav/CMakeLists.txt (modified) (1 diff)
• demos/MixedReality/real/uav/build_core2_64/bin/MixedReality_uav_real_nrt (deleted)
• demos/MixedReality/real/uav/build_core2_64/bin/MixedReality_uav_real_rt (deleted)
• demos/MixedReality/virtual/simulator/CMakeLists.txt (modified) (1 diff)
• demos/MixedReality/virtual/uav/CMakeLists.txt (modified) (1 diff)
• demos/OpticalFlow/simulator/CMakeLists.txt (modified) (1 diff)
• demos/OpticalFlow/uav/CMakeLists.txt (modified) (1 diff)
• demos/PidStandalone/simulator/CMakeLists.txt (modified) (1 diff)
• demos/PidStandalone/uav/CMakeLists.txt (modified) (1 diff)
• demos/SimpleFleet/simulator/CMakeLists.txt (modified) (1 diff)
• demos/SimpleFleet/uav/CMakeLists.txt (modified) (1 diff)
• demos/Sinus/CMakeLists.txt (modified) (1 diff)
• demos/Skeletons/CustomReferenceAngles/CMakeLists.txt (modified) (1 diff)
• demos/Skeletons/CustomTorques/CMakeLists.txt (modified) (1 diff)
• lib/CMakeLists.txt (added)
• lib/FlairCore/CMakeLists.txt (modified) (2 diffs)
• lib/FlairFilter/CMakeLists.txt (modified) (1 diff)
• lib/FlairMeta/CMakeLists.txt (modified) (1 diff)
• lib/FlairSensorActuator/CMakeLists.txt (modified) (2 diffs)
• lib/FlairSimulator/CMakeLists.txt (modified) (1 diff)
• lib/FlairVisionFilter/CMakeLists.txt (modified) (2 diffs)
• tools/CMakeLists.txt (added)
• tools/FlairGCS/CMakeLists.txt (modified) (2 diffs)

trunk/demos/CircleFollower/simulator/CMakeLists.txt

@@ -10 +10 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
+        ./src/main.cpp
 )
 

trunk/demos/CircleFollower/uav/CMakeLists.txt

@@ -13 +13 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
-        ${CMAKE_SOURCE_DIR}/src/CircleFollower.cpp
+        src/main.cpp
+        src/CircleFollower.cpp
 )
 

trunk/demos/Gps/simulator/CMakeLists.txt

@@ -10 +10 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
+        src/main.cpp
 )
 

trunk/demos/Gps/uav/CMakeLists.txt

@@ -12 +12 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
-        ${CMAKE_SOURCE_DIR}/src/DemoGps.cpp
+        src/main.cpp
+        src/DemoGps.cpp
 )
 

trunk/demos/MixedReality/real/simulator/CMakeLists.txt

@@ -12 +12 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
+        src/main.cpp
 )
 

trunk/demos/MixedReality/real/uav/CMakeLists.txt

@@ -13 +13 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
-        ${CMAKE_SOURCE_DIR}/src/CircleFollower.cpp
+        src/main.cpp
+        src/CircleFollower.cpp
 )
 

trunk/demos/MixedReality/virtual/simulator/CMakeLists.txt

@@ -13 +13 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
+        src/main.cpp
 )
 

trunk/demos/MixedReality/virtual/uav/CMakeLists.txt

@@ -13 +13 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
-        ${CMAKE_SOURCE_DIR}/src/App.cpp
+        src/main.cpp
+        src/App.cpp
 )
 

trunk/demos/OpticalFlow/simulator/CMakeLists.txt

@@ -11 +11 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
+        src/main.cpp
 )
 

trunk/demos/OpticalFlow/uav/CMakeLists.txt

@@ -14 +14 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
-        ${CMAKE_SOURCE_DIR}/src/DemoOpticalFlow.cpp
+        src/main.cpp
+        src/DemoOpticalFlow.cpp
 )
 

trunk/demos/PidStandalone/simulator/CMakeLists.txt

@@ -10 +10 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
+        src/main.cpp
 )
 

trunk/demos/PidStandalone/uav/CMakeLists.txt

@@ -12 +12 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
-        ${CMAKE_SOURCE_DIR}/src/PidUav.cpp
+        src/main.cpp
+        src/PidUav.cpp
 )
 

trunk/demos/SimpleFleet/simulator/CMakeLists.txt

@@ -10 +10 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
+        src/main.cpp
 )
 

trunk/demos/SimpleFleet/uav/CMakeLists.txt

@@ -13 +13 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
-        ${CMAKE_SOURCE_DIR}/src/SimpleFleet.cpp
+        src/main.cpp
+        src/SimpleFleet.cpp
 )
 

trunk/demos/Sinus/CMakeLists.txt

@@ -9 +9 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
-        ${CMAKE_SOURCE_DIR}/src/Loop.cpp
-        ${CMAKE_SOURCE_DIR}/src/Sinus.cpp
-        ${CMAKE_SOURCE_DIR}/src/MeanFilter.cpp
+        src/main.cpp
+        src/Loop.cpp
+        src/Sinus.cpp
+        src/MeanFilter.cpp
 )
 

trunk/demos/Skeletons/CustomReferenceAngles/CMakeLists.txt

@@ -12 +12 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
-        ${CMAKE_SOURCE_DIR}/src/MyApp.cpp
+        src/main.cpp
+        src/MyApp.cpp
 )
 

trunk/demos/Skeletons/CustomTorques/CMakeLists.txt

@@ -12 +12 @@
 
 SET(SRC_FILES
-        ${CMAKE_SOURCE_DIR}/src/main.cpp
-        ${CMAKE_SOURCE_DIR}/src/MyApp.cpp
+        src/main.cpp
+        src/MyApp.cpp
 )
 

trunk/lib/FlairCore/CMakeLists.txt

@@ -28 +28 @@
 )
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/nrt)
 if(NOT WIN32)
@@ -36 +34 @@
 
 add_custom_target(
-        compile_info
+        ${PROJECT_NAME}_compile_info
         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
 )
 
-add_dependencies(FlairCore_rt compile_info)
-add_dependencies(FlairCore_nrt compile_info)
+add_dependencies(FlairCore_rt ${PROJECT_NAME}_compile_info)
+add_dependencies(FlairCore_nrt ${PROJECT_NAME}_compile_info)

trunk/lib/FlairFilter/CMakeLists.txt

@@ -43 +43 @@
 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 add_custom_target(
-        compile_info
+        ${PROJECT_NAME}_compile_info
         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
 )
 
-add_dependencies(${PROJECT_NAME} compile_info)
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)

trunk/lib/FlairMeta/CMakeLists.txt

@@ -43 +43 @@
 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 add_custom_target(
-        compile_info
+        ${PROJECT_NAME}_compile_info
         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
 )
 
-add_dependencies(${PROJECT_NAME} compile_info)
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)

trunk/lib/FlairSensorActuator/CMakeLists.txt

@@ -30 +30 @@
 FILE(GLOB SENSOR_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 ADD_LIBRARY(${PROJECT_NAME}
         ${SENSOR_SRC}
@@ -45 +43 @@
 
 add_custom_target(
-        compile_info
+        ${PROJECT_NAME}_compile_info
         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
 )
 
-add_dependencies(${PROJECT_NAME} compile_info)
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)

trunk/lib/FlairSimulator/CMakeLists.txt

@@ -31 +31 @@
 FILE(GLOB SIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 add_custom_target(
-        compile_info
+        ${PROJECT_NAME}_compile_info
         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
 )
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/no_gl)
-add_dependencies(FlairSimulator_nogl compile_info)
+add_dependencies(FlairSimulator_nogl ${PROJECT_NAME}_compile_info)
 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gl)
-add_dependencies(FlairSimulator_gl compile_info)
+add_dependencies(FlairSimulator_gl ${PROJECT_NAME}_compile_info)
 endif()

trunk/lib/FlairVisionFilter/CMakeLists.txt

@@ -31 +31 @@
 FILE(GLOB SRC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 ADD_LIBRARY(${PROJECT_NAME}
         ${SRC_SRC}
@@ -46 +44 @@
 
 add_custom_target(
-        compile_info
+        ${PROJECT_NAME}_compile_info
         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
 )
 
-add_dependencies(${PROJECT_NAME} compile_info)
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
 
 else()

trunk/tools/FlairGCS/CMakeLists.txt

@@ -58 +58 @@
 include_directories(
         ${CMAKE_SOURCE_DIR}/src
-        ${CMAKE_SOURCE_DIR}/../../lib/FlairCore/src/unexported
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/FlairCore/src/unexported
         ${QT_INCLUDE_DIR}
         ${CMAKE_SYSROOT}/usr/include/udt
@@ -80 +80 @@
 
 add_custom_target(
-        compile_info
+        ${PROJECT_NAME}_compile_info
         COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
 )
 
-add_dependencies(${PROJECT_NAME} compile_info)
-
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)