fix remaining clang include errors, add cmake for HelloCar, update cm…

…ake for dir structure
b-xiang · Sep 28, 2017 · 61cf494 · 61cf494
1 parent 058f3c1
commit 61cf494
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 5 deletions.
diff --git a/AirLib/include/vehicles/multirotor/configs/SimpleFlightQuadX.hpp b/AirLib/include/vehicles/multirotor/configs/SimpleFlightQuadX.hpp
@@ -4,7 +4,7 @@
 #ifndef msr_airlib_vehicles_SimpleFlightQuadX_hpp
 #define msr_airlib_vehicles_SimpleFlightQuadX_hpp
 
-#include "firmwares/simple_flight/SimpleFlightDroneController.hpp"
+#include "vehicles/multirotor/firmwares/simple_flight/SimpleFlightDroneController.hpp"
 #include "vehicles/multirotor/MultiRotorParams.hpp"
 #include "controllers/Settings.hpp"
 

diff --git a/AirLib/include/vehicles/multirotor/firmwares/ros_flight/RosFlightDroneController.hpp b/AirLib/include/vehicles/multirotor/firmwares/ros_flight/RosFlightDroneController.hpp
@@ -4,7 +4,7 @@
 #ifndef msr_airlib_RosFlightDroneController_hpp
 #define msr_airlib_RosFlightDroneController_hpp
 
-#include "controllers/DroneControllerBase.hpp"
+#include "vehicles/multirotor/controllers/DroneControllerBase.hpp"
 #include "sensors/SensorCollection.hpp"
 #include "physics/Environment.hpp"
 #include "physics/Kinematics.hpp"

diff --git a/AirLib/include/vehicles/multirotor/firmwares/simple_flight/SimpleFlightDroneController.hpp b/AirLib/include/vehicles/multirotor/firmwares/simple_flight/SimpleFlightDroneController.hpp
@@ -4,7 +4,7 @@
 #ifndef msr_airlib_SimpleFlightDroneController_hpp
 #define msr_airlib_SimpleFlightDroneController_hpp
 
-#include "controllers/DroneControllerBase.hpp"
+#include "vehicles/multirotor/controllers/DroneControllerBase.hpp"
 #include "sensors/SensorCollection.hpp"
 #include "physics/Environment.hpp"
 #include "physics/Kinematics.hpp"

diff --git a/...rotor/controllers/DroneControllerBase.cpp → ...b/src/controllers/DroneControllerBase.cpp b/...rotor/controllers/DroneControllerBase.cpp → ...b/src/controllers/DroneControllerBase.cpp
diff --git a/Unreal/Environments/Blocks/Blocks.uproject b/Unreal/Environments/Blocks/Blocks.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.16",
+	"EngineAssociation": "{1D3B760A-2107-0115-0013-02AF1DCEC6C8}",
 	"Category": "",
 	"Description": "",
 	"Modules": [

diff --git a/cmake/AirLib/CMakeLists.txt b/cmake/AirLib/CMakeLists.txt
@@ -14,7 +14,13 @@ include_directories(
   ${RPC_LIB_INCLUDES}
 )
 
-file(GLOB_RECURSE ${PROJECT_NAME}_sources ${AIRSIM_ROOT}/${PROJECT_NAME}/src/*.cpp)
+file(GLOB_RECURSE ${PROJECT_NAME}_sources 
+  ${AIRSIM_ROOT}/${PROJECT_NAME}/src/common/common_utils/*.cpp
+  ${AIRSIM_ROOT}/${PROJECT_NAME}/src/safety/*.cpp
+  ${AIRSIM_ROOT}/${PROJECT_NAME}/src/vehicles/car/api/*.cpp
+  ${AIRSIM_ROOT}/${PROJECT_NAME}/src/vehicles/multirotor/api/*.cpp
+  ${AIRSIM_ROOT}/${PROJECT_NAME}/src/controllers/*.cpp
+  )
 add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_sources})
 
 CommonTargetLink()

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -6,6 +6,7 @@ add_subdirectory("AirLib")
 add_subdirectory("MavLinkCom")
 add_subdirectory("AirLibUnitTests")
 add_subdirectory("HelloDrone")
+add_subdirectory("HelloCar")
 add_subdirectory("DroneShell")
 add_subdirectory("DroneServer")
 

diff --git a/cmake/HelloCar/CMakeLists.txt b/cmake/HelloCar/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.5.0)
+project(HelloCar)
+
+LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules") 
+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
+CommonSetup()
+
+IncludeEigen()
+
+SetupConsoleBuild()
+
+## Specify additional locations of header files
+include_directories(
+  ${AIRSIM_ROOT}/HelloCar
+  ${AIRSIM_ROOT}/AirLib/include
+  ${RPC_LIB_INCLUDES}
+  ${AIRSIM_ROOT}/MavLinkCom/include
+  ${AIRSIM_ROOT}/MavLinkCom/common_utils
+)
+
+AddExecutableSource()
+
+CommonTargetLink()
+target_link_libraries(${PROJECT_NAME} AirLib)
+target_link_libraries(${PROJECT_NAME} ${RPC_LIB})