Changeset 297 in flair-src
- Timestamp:
- 01/28/19 17:22:21 (5 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 2 deleted
- 24 edited
-
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)
Legend:
- Unmodified
- Added
- Removed
-
trunk/demos/CircleFollower/simulator/CMakeLists.txt
r42 r297 10 10 11 11 SET(SRC_FILES 12 ${CMAKE_SOURCE_DIR}/src/main.cpp12 ./src/main.cpp 13 13 ) 14 14 -
trunk/demos/CircleFollower/uav/CMakeLists.txt
r123 r297 13 13 14 14 SET(SRC_FILES 15 ${CMAKE_SOURCE_DIR}/src/main.cpp16 ${CMAKE_SOURCE_DIR}/src/CircleFollower.cpp15 src/main.cpp 16 src/CircleFollower.cpp 17 17 ) 18 18 -
trunk/demos/Gps/simulator/CMakeLists.txt
r185 r297 10 10 11 11 SET(SRC_FILES 12 ${CMAKE_SOURCE_DIR}/src/main.cpp12 src/main.cpp 13 13 ) 14 14 -
trunk/demos/Gps/uav/CMakeLists.txt
r185 r297 12 12 13 13 SET(SRC_FILES 14 ${CMAKE_SOURCE_DIR}/src/main.cpp15 ${CMAKE_SOURCE_DIR}/src/DemoGps.cpp14 src/main.cpp 15 src/DemoGps.cpp 16 16 ) 17 17 -
trunk/demos/MixedReality/real/simulator/CMakeLists.txt
r293 r297 12 12 13 13 SET(SRC_FILES 14 ${CMAKE_SOURCE_DIR}/src/main.cpp14 src/main.cpp 15 15 ) 16 16 -
trunk/demos/MixedReality/real/uav/CMakeLists.txt
r292 r297 13 13 14 14 SET(SRC_FILES 15 ${CMAKE_SOURCE_DIR}/src/main.cpp16 ${CMAKE_SOURCE_DIR}/src/CircleFollower.cpp15 src/main.cpp 16 src/CircleFollower.cpp 17 17 ) 18 18 -
trunk/demos/MixedReality/virtual/simulator/CMakeLists.txt
r293 r297 13 13 14 14 SET(SRC_FILES 15 ${CMAKE_SOURCE_DIR}/src/main.cpp15 src/main.cpp 16 16 ) 17 17 -
trunk/demos/MixedReality/virtual/uav/CMakeLists.txt
r293 r297 13 13 14 14 SET(SRC_FILES 15 ${CMAKE_SOURCE_DIR}/src/main.cpp16 ${CMAKE_SOURCE_DIR}/src/App.cpp15 src/main.cpp 16 src/App.cpp 17 17 ) 18 18 -
trunk/demos/OpticalFlow/simulator/CMakeLists.txt
r224 r297 11 11 12 12 SET(SRC_FILES 13 ${CMAKE_SOURCE_DIR}/src/main.cpp13 src/main.cpp 14 14 ) 15 15 -
trunk/demos/OpticalFlow/uav/CMakeLists.txt
r224 r297 14 14 15 15 SET(SRC_FILES 16 ${CMAKE_SOURCE_DIR}/src/main.cpp17 ${CMAKE_SOURCE_DIR}/src/DemoOpticalFlow.cpp16 src/main.cpp 17 src/DemoOpticalFlow.cpp 18 18 ) 19 19 -
trunk/demos/PidStandalone/simulator/CMakeLists.txt
r105 r297 10 10 11 11 SET(SRC_FILES 12 ${CMAKE_SOURCE_DIR}/src/main.cpp12 src/main.cpp 13 13 ) 14 14 -
trunk/demos/PidStandalone/uav/CMakeLists.txt
r236 r297 12 12 13 13 SET(SRC_FILES 14 ${CMAKE_SOURCE_DIR}/src/main.cpp15 ${CMAKE_SOURCE_DIR}/src/PidUav.cpp14 src/main.cpp 15 src/PidUav.cpp 16 16 ) 17 17 -
trunk/demos/SimpleFleet/simulator/CMakeLists.txt
r42 r297 10 10 11 11 SET(SRC_FILES 12 ${CMAKE_SOURCE_DIR}/src/main.cpp12 src/main.cpp 13 13 ) 14 14 -
trunk/demos/SimpleFleet/uav/CMakeLists.txt
r123 r297 13 13 14 14 SET(SRC_FILES 15 ${CMAKE_SOURCE_DIR}/src/main.cpp16 ${CMAKE_SOURCE_DIR}/src/SimpleFleet.cpp15 src/main.cpp 16 src/SimpleFleet.cpp 17 17 ) 18 18 -
trunk/demos/Sinus/CMakeLists.txt
r14 r297 9 9 10 10 SET(SRC_FILES 11 ${CMAKE_SOURCE_DIR}/src/main.cpp12 ${CMAKE_SOURCE_DIR}/src/Loop.cpp13 ${CMAKE_SOURCE_DIR}/src/Sinus.cpp14 ${CMAKE_SOURCE_DIR}/src/MeanFilter.cpp11 src/main.cpp 12 src/Loop.cpp 13 src/Sinus.cpp 14 src/MeanFilter.cpp 15 15 ) 16 16 -
trunk/demos/Skeletons/CustomReferenceAngles/CMakeLists.txt
r123 r297 12 12 13 13 SET(SRC_FILES 14 ${CMAKE_SOURCE_DIR}/src/main.cpp15 ${CMAKE_SOURCE_DIR}/src/MyApp.cpp14 src/main.cpp 15 src/MyApp.cpp 16 16 ) 17 17 -
trunk/demos/Skeletons/CustomTorques/CMakeLists.txt
r123 r297 12 12 13 13 SET(SRC_FILES 14 ${CMAKE_SOURCE_DIR}/src/main.cpp15 ${CMAKE_SOURCE_DIR}/src/MyApp.cpp14 src/main.cpp 15 src/MyApp.cpp 16 16 ) 17 17 -
trunk/lib/FlairCore/CMakeLists.txt
r273 r297 28 28 ) 29 29 30 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)31 32 30 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/nrt) 33 31 if(NOT WIN32) … … 36 34 37 35 add_custom_target( 38 compile_info36 ${PROJECT_NAME}_compile_info 39 37 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 40 38 ) 41 39 42 add_dependencies(FlairCore_rt compile_info)43 add_dependencies(FlairCore_nrt compile_info)40 add_dependencies(FlairCore_rt ${PROJECT_NAME}_compile_info) 41 add_dependencies(FlairCore_nrt ${PROJECT_NAME}_compile_info) -
trunk/lib/FlairFilter/CMakeLists.txt
r273 r297 43 43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME}) 44 44 45 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)46 47 45 add_custom_target( 48 compile_info46 ${PROJECT_NAME}_compile_info 49 47 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 50 48 ) 51 49 52 add_dependencies(${PROJECT_NAME} compile_info)50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info) -
trunk/lib/FlairMeta/CMakeLists.txt
r273 r297 43 43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME}) 44 44 45 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)46 47 45 add_custom_target( 48 compile_info46 ${PROJECT_NAME}_compile_info 49 47 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 50 48 ) 51 49 52 add_dependencies(${PROJECT_NAME} compile_info)50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info) -
trunk/lib/FlairSensorActuator/CMakeLists.txt
r273 r297 30 30 FILE(GLOB SENSOR_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") 31 31 32 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)33 34 32 ADD_LIBRARY(${PROJECT_NAME} 35 33 ${SENSOR_SRC} … … 45 43 46 44 add_custom_target( 47 compile_info45 ${PROJECT_NAME}_compile_info 48 46 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 49 47 ) 50 48 51 add_dependencies(${PROJECT_NAME} compile_info)49 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info) -
trunk/lib/FlairSimulator/CMakeLists.txt
r273 r297 31 31 FILE(GLOB SIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") 32 32 33 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)34 35 33 add_custom_target( 36 compile_info34 ${PROJECT_NAME}_compile_info 37 35 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 38 36 ) 39 37 40 38 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/no_gl) 41 add_dependencies(FlairSimulator_nogl compile_info)39 add_dependencies(FlairSimulator_nogl ${PROJECT_NAME}_compile_info) 42 40 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") 43 41 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gl) 44 add_dependencies(FlairSimulator_gl compile_info)42 add_dependencies(FlairSimulator_gl ${PROJECT_NAME}_compile_info) 45 43 endif() -
trunk/lib/FlairVisionFilter/CMakeLists.txt
r273 r297 31 31 FILE(GLOB SRC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") 32 32 33 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)34 35 33 ADD_LIBRARY(${PROJECT_NAME} 36 34 ${SRC_SRC} … … 46 44 47 45 add_custom_target( 48 compile_info46 ${PROJECT_NAME}_compile_info 49 47 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 50 48 ) 51 49 52 add_dependencies(${PROJECT_NAME} compile_info)50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info) 53 51 54 52 else() -
trunk/tools/FlairGCS/CMakeLists.txt
r221 r297 58 58 include_directories( 59 59 ${CMAKE_SOURCE_DIR}/src 60 ${CMAKE_ SOURCE_DIR}/../../lib/FlairCore/src/unexported60 ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/FlairCore/src/unexported 61 61 ${QT_INCLUDE_DIR} 62 62 ${CMAKE_SYSROOT}/usr/include/udt … … 80 80 81 81 add_custom_target( 82 compile_info82 ${PROJECT_NAME}_compile_info 83 83 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 84 84 ) 85 85 86 add_dependencies(${PROJECT_NAME} compile_info) 87 86 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info) 88 87 89 88 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
Note:
See TracChangeset
for help on using the changeset viewer.
