ArduPilot · srmainwaring · Apr 14, 2022 · Jan 19, 2021 · Jan 20, 2021 · Jan 21, 2021
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,170 +1,110 @@
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-
+cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+#============================================================================
+# Initialize the project
+#============================================================================
 project(ardupilot_sitl_gazebo)
 
-
-#######################
-## Find Dependencies ##
-#######################
-
-find_package(gazebo REQUIRED)
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GAZEBO_CXX_FLAGS}")
-
-if("${GAZEBO_VERSION}" VERSION_LESS "8.0")
-    message(FATAL_ERROR "You need at least Gazebo 8.0. Your version: ${GAZEBO_VERSION}")
-else()
-    message("Gazebo version: ${GAZEBO_VERSION}")
-endif()
-
-###### COMPILE RULES ######
-include(CheckCXXCompilerFlag)
-
-macro(filter_valid_compiler_flags)
-  foreach(flag ${ARGN})
-    CHECK_CXX_COMPILER_FLAG(${flag} R${flag})
-    if(${R${flag}})
-      set(VALID_CXX_FLAGS "${VALID_CXX_FLAGS} ${flag}")
-    endif()
-  endforeach()
-endmacro()
-
-set(CMAKE_CXX_EXTENSIONS off)  # see gazebo CMakeList
-
-if (NOT CMAKE_BUILD_TYPE)
-  set (CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
-      "Choose the type of build, options are: Debug Release RelWithDebInfo Profile Check" FORCE)
-endif (NOT CMAKE_BUILD_TYPE)
-
-# Build type link flags
-set (CMAKE_LINK_FLAGS_RELEASE " " CACHE INTERNAL "Link flags for release" FORCE)
-set (CMAKE_LINK_FLAGS_RELWITHDEBINFO " " CACHE INTERNAL "Link flags for release with debug support" FORCE)
-set (CMAKE_LINK_FLAGS_DEBUG " " CACHE INTERNAL "Link flags for debug" FORCE)
-set (CMAKE_LINK_FLAGS_PROFILE " -pg" CACHE INTERNAL "Link flags for profile" FORCE)
-set (CMAKE_LINK_FLAGS_COVERAGE " --coverage" CACHE INTERNAL "Link flags for static code coverage" FORCE)
-
-set (CMAKE_C_FLAGS_RELEASE "")
-if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND NOT MSVC)
-  # -s doesn't work with clang or Visual Studio, see alternative in link below:
-  # http://stackoverflow.com/questions/6085491/gcc-vs-clang-symbol-strippingu
-  set (CMAKE_C_FLAGS_RELEASE "-s")
-endif()
-
-if (NOT MSVC)
-  set (CMAKE_C_FLAGS_RELEASE " ${CMAKE_C_FLAGS_RELEASE} -O3 -DNDEBUG ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for release" FORCE)
-  set (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
-
-  set (CMAKE_C_FLAGS_RELWITHDEBINFO " -g -O2 ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for release with debug support" FORCE)
-  set (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-
-  set (CMAKE_C_FLAGS_DEBUG " -ggdb3 ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for debug" FORCE)
-  set (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
-
-  set (CMAKE_C_FLAGS_PROFILE " -fno-omit-frame-pointer -g -pg ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for profile" FORCE)
-  set (CMAKE_CXX_FLAGS_PROFILE ${CMAKE_C_FLAGS_PROFILE})
-
-  set (CMAKE_C_FLAGS_COVERAGE " -g -O0 -Wformat=2 --coverage -fno-inline ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for static code coverage" FORCE)
-  set (CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_C_FLAGS_COVERAGE}")
-  if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    # -fno-default-inline -fno-implicit-inline-templates are unimplemented, cause errors in clang
-    # -fno-elide-constructors can cause seg-faults in clang 3.4 and earlier
-    # http://llvm.org/bugs/show_bug.cgi?id=12208
-    set (CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} -fno-default-inline -fno-implicit-inline-templates -fno-elide-constructors")
-  endif()
-endif()
-
-#####################################
-# Set all the global build flags
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-
-# Compiler-specific C++11 activation.
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-  execute_process(
-      COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-  if (NOT (GCC_VERSION VERSION_GREATER 4.7))
-    message(FATAL_ERROR "${PROJECT_NAME} requires g++ 4.8 or greater.")
-  endif ()
-elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-  execute_process(
-      COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CLANG_VERSION)
-  if (NOT (CLANG_VERSION VERSION_GREATER 3.2))
-    message(FATAL_ERROR "${PROJECT_NAME} requires clang 3.3 or greater.")
-  endif ()
-
-  if ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-  endif ()
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-  if (MSVC_VERSION LESS 1800)
-    message(FATAL_ERROR "${PROJECT_NAME} requires VS 2013 or greater.")
-  endif ()
-else ()
-  message(FATAL_ERROR "Your C++ compiler does not support C++11.")
-endif ()
-
-set(WARN_LEVEL "-Wall")
-filter_valid_compiler_flags(${WARN_LEVEL}
-    -Wextra -Wno-long-long -Wno-unused-value -Wfloat-equal -Wshadow
-    -Wswitch-default -Wmissing-include-dirs -pedantic)
-if (UNIX AND NOT APPLE)
-  filter_valid_compiler_flags(-fvisibility=hidden -fvisibility-inlines-hidden)
-endif()
-
-set(UNFILTERED_FLAGS "-std=c++14")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VALID_CXX_FLAGS} ${UNFILTERED_FLAGS}")
-
-###########
-## Build ##
-###########
-
-include_directories(
-        ${PROJECT_SOURCE_DIR}
-        include
-        ${GAZEBO_INCLUDE_DIRS}
-        )
-
-link_libraries(
-        ${GAZEBO_LIBRARIES}
-        )
-
-link_directories(
-        ${GAZEBO_LIBRARY_DIRS}
-        )
-
-set (plugins_single_header
-        ArduPilotPlugin
-        ArduCopterIRLockPlugin
-        GimbalSmall2dPlugin
-        )
-
-add_library(ArduCopterIRLockPlugin SHARED src/ArduCopterIRLockPlugin.cc)
-target_link_libraries(ArduCopterIRLockPlugin ${GAZEBO_LIBRARIES})
-
-add_library(ArduPilotPlugin SHARED src/ArduPilotPlugin.cc)
-target_link_libraries(ArduPilotPlugin ${GAZEBO_LIBRARIES})
-
-if("${GAZEBO_VERSION}" VERSION_LESS "8.0")
-    add_library(GimbalSmall2dPlugin SHARED src/GimbalSmall2dPlugin.cc)
-    target_link_libraries(GimbalSmall2dPlugin ${GAZEBO_LIBRARIES})
-    install(TARGETS GimbalSmall2dPlugin DESTINATION ${GAZEBO_PLUGIN_PATH})
-endif()
-
-install(TARGETS ArduCopterIRLockPlugin DESTINATION ${GAZEBO_PLUGIN_PATH})
-install(TARGETS ArduPilotPlugin DESTINATION ${GAZEBO_PLUGIN_PATH})
-
-install(DIRECTORY models DESTINATION ${GAZEBO_MODEL_PATH}/..)
-install(DIRECTORY worlds DESTINATION ${GAZEBO_MODEL_PATH}/..)
-
-# uninstall target
-if(NOT TARGET uninstall)
-  configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
-
-  add_custom_target(uninstall
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-endif()
+#------------------------------------------------------------------------
+# Compile as C++14
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+#============================================================================
+# Find ignition-cmake
+#============================================================================
+find_package(ignition-cmake2 2.8.0 REQUIRED)
+set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
+
+#============================================================================
+# Search for project-specific dependencies
+#============================================================================
+
+# ign_find_package(sdformat11 REQUIRED VERSION 11.2.2)
+# set(SDF_VER ${sdformat11_VERSION_MAJOR})
+
+#--------------------------------------
+# Find ignition-common
+# ign_find_package(ignition-common4 REQUIRED COMPONENTS all)
+# set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
+
+#--------------------------------------
+# Find ignition-gazebo
+ign_find_package(ignition-gazebo5 REQUIRED)
+set(IGN_GAZEBO_VER ${ignition-gazebo5_VERSION_MAJOR})
+
+#--------------------------------------
+# Find ignition-math
+# ign_find_package(ignition-math6 REQUIRED VERSION 6.8)
+# set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
+
+#--------------------------------------
+# Find ignition-msgs
+# ign_find_package(ignition-msgs7 REQUIRED VERSION 7.1)
+# set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
+
+#--------------------------------------
+# Find ignition-physics
+# ign_find_package(ignition-physics4 REQUIRED)
+# set(IGN_PHYSICS_VER ${ignition-physics4_VERSION_MAJOR})
+
+#--------------------------------------
+# Find ignition-plugin
+# ign_find_package(ignition-plugin1 REQUIRED)
+# set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
+
+#--------------------------------------
+# Find ignition-sensors
+# ign_find_package(ignition-sensors5 REQUIRED)
+# set(IGN_SENSORS_VER ${ignition-sensors5_VERSION_MAJOR})
+
+#--------------------------------------
+# Find RapidJSON
+find_package(RapidJSON REQUIRED)
+
+#======================================
+# Find Qt
+# find_package(Qt5 REQUIRED COMPONENTS
+#     Core
+#     Gui
+#     Qml
+#     Quick
+#     QuickControls2
+#     Widgets
+# )
+
+add_library(ArduPilotPlugin
+    SHARED
+    src/ArduPilotPlugin.cc
+    src/Socket.cpp
+)
+
+target_include_directories(ArduPilotPlugin PUBLIC
+  # ${PROJECT_SOURCE_DIR}
+  include
+# 	${SDFORMAT-INCLUDE_DIRS}
+#   ${IGNITION-COMMON_INCLUDE_DIRS}
+	${IGNITION-GAZEBO_INCLUDE_DIRS}
+# 	${IGNITION-MATH_INCLUDE_DIRS}
+# 	${IGNITION-MSGS_INCLUDE_DIRS}
+# 	${IGNITION-PHYSICS_INCLUDE_DIRS}
+# 	${IGNITION-SENSORS_INCLUDE_DIRS}
+# 	${IGNITION-TRANSPORT_INCLUDE_DIRS}
+#   ${RAPIDJSON_INCLUDE_DIRS}
+)
+
+target_link_libraries(ArduPilotPlugin PUBLIC
+  # ${SDFORMAT-LIBRARIES}
+  # ${IGNITION-COMMON_LIBRARIES}
+  ${IGNITION-GAZEBO_LIBRARIES}
+  # ${IGNITION-MATH_LIBRARIES}
+  # ${IGNITION-MSGS_LIBRARIES}
+  # ${IGNITION-PHYSICS_LIBRARIES}
+  # ${IGNITION-SENSORS_LIBRARIES}
+  # ${IGNITION-TRANSPORT_LIBRARIES}
+  # Qt5::Core
+  # Qt5::Gui
+  # Qt5::Qml
+  # Qt5::Quick
+)
diff --git a/INSTALL.md b/INSTALL.md
@@ -0,0 +1,56 @@
+# Install
+
+## Ubtunu 18.04
+
+Gazebo11 is required.
+
+```bash
+$ sudo apt-get update
+$ sudo apt-get upgrade
+$ sudo apt-get install libgazebo11
+$ sudo apt-get install libgazebo11-dev
+$ sudo apt-get install gazebo11
+```
+
+If you are seeing errors like:
+
+```bash
+$ gazebo --verbose
+Gazebo multi-robot simulator, version 11.3.0
+Copyright (C) 2012 Open Source Robotics Foundation.
+Released under the Apache 2 License.
+http://gazebosim.org
+
+[Msg] Waiting for master.
+Gazebo multi-robot simulator, version 11.3.0
+Copyright (C) 2012 Open Source Robotics Foundation.
+Released under the Apache 2 License.
+http://gazebosim.org
+
+[Msg] Waiting for master.
+[Msg] Connected to gazebo master @ http://127.0.0.1:11345
+[Msg] Publicized address: 192.168.1.170
+[Err] [RTShaderSystem.cc:478] Unable to find shader lib. Shader generating will fail.[Wrn] [SystemPaths.cc:459] File or path does not exist [""] [worlds/empty.world]
+[Err] [Server.cc:444] Could not open file[worlds/empty.world]
+[Wrn] [Server.cc:359] Falling back on worlds/empty.world
+[Wrn] [SystemPaths.cc:459] File or path does not exist [""] [worlds/empty.world]
+[Err] [Server.cc:444] Could not open file[worlds/empty.world]
+[Msg] Connected to gazebo master @ http://127.0.0.1:11345
+[Msg] Publicized address: 192.168.1.170
+[Err] [RTShaderSystem.cc:478] Unable to find shader lib. Shader generating will fail.
+```
+
+You may need to update your `~/.bashrc`:
+
+```bash
+# Gazebo
+- source /usr/share/gazebo-9/setup.sh
++ source /usr/share/gazebo-11/setup.sh
+```
+
+RapidJSON is required:
+
+```
+$ sudo apt-get update
+$ sudo apt-get install rapidjson-dev
+```
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ sudo apt-get install libgazeboX-dev
 ````
 
 ````
-git clone https://github.com/khancyr/ardupilot_gazebo
+git clone https://github.com/ArduPilot/ardupilot_gazebo
 cd ardupilot_gazebo
 mkdir build
 cd build