Merge pull request #435 from Stifael/cmake_public_vs_private_header

Cmake public vs private header
mavlink · Jul 26, 2018 · e9597c5 · e9597c5
2 parents 016cad4 + a48ec8d
commit e9597c5
Show file tree

Hide file tree

Showing 62 changed files with 148 additions and 68 deletions.
diff --git a/backend/src/grpc_server.h b/backend/src/grpc_server.h
@@ -3,13 +3,13 @@
 #include <grpc++/server.h>
 #include <memory>
 
-#include "action/action.h"
+#include "plugins/action/action.h"
 #include "action/action_service_impl.h"
-#include "camera/camera.h"
+#include "plugins/camera/camera.h"
 #include "camera/camera_service_impl.h"
 #include "core/core_service_impl.h"
 #include "dronecode_sdk.h"
-#include "mission/mission.h"
+#include "plugins/mission/mission.h"
 #include "mission/mission_service_impl.h"
 #include "telemetry/telemetry_service_impl.h"
 

diff --git a/backend/src/plugins/action/action_service_impl.h b/backend/src/plugins/action/action_service_impl.h
@@ -1,4 +1,4 @@
-#include "action/action.h"
+#include "plugins/action/action.h"
 #include "action/action.grpc.pb.h"
 
 namespace dronecode_sdk {

diff --git a/backend/src/plugins/camera/camera_service_impl.h b/backend/src/plugins/camera/camera_service_impl.h
@@ -1,6 +1,6 @@
 #include <future>
 
-#include "camera/camera.h"
+#include "plugins/camera/camera.h"
 #include "camera/camera.grpc.pb.h"
 
 namespace dronecode_sdk {

diff --git a/backend/src/plugins/mission/mission_service_impl.h b/backend/src/plugins/mission/mission_service_impl.h
@@ -3,9 +3,9 @@
 #include <memory>
 #include <vector>
 
-#include "mission/mission.h"
+#include "plugins/mission/mission.h"
 #include "mission/mission.grpc.pb.h"
-#include "mission/mission_item.h"
+#include "plugins/mission/mission_item.h"
 
 namespace dronecode_sdk {
 namespace backend {

diff --git a/backend/src/plugins/telemetry/telemetry_service_impl.h b/backend/src/plugins/telemetry/telemetry_service_impl.h
@@ -1,6 +1,6 @@
 #include <future>
 
-#include "telemetry/telemetry.h"
+#include "plugins/telemetry/telemetry.h"
 #include "telemetry/telemetry.grpc.pb.h"
 
 namespace dronecode_sdk {

diff --git a/backend/test/mission_service_impl_test.cpp b/backend/test/mission_service_impl_test.cpp
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "mission/mission_service_impl.h"
-#include "mission/mission_item.h"
+#include "plugins/mission/mission_item.h"
 #include "mission/mocks/mission_mock.h"
 
 namespace {

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -74,13 +74,21 @@ install(TARGETS dronecode_sdk
 )
 
 install(FILES
-    connection_result.h
-    system.h
-    dronecode_sdk.h
-    plugin_base.h
+    include/connection_result.h
+    include/system.h
+    include/dronecode_sdk.h
+    include/plugin_base.h
     DESTINATION "include/dronecode_sdk"
 )
 
+target_include_directories(dronecode_sdk 
+PUBLIC 
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${plugin_header_paths}
+PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 list(APPEND UNIT_TEST_SOURCES
     ${PROJECT_SOURCE_DIR}/core/global_include_test.cpp
     ${PROJECT_SOURCE_DIR}/core/mavlink_channels_test.cpp

diff --git a/core/connection_result.h → core/include/connection_result.h b/core/connection_result.h → core/include/connection_result.h
diff --git a/core/dronecode_sdk.h → core/include/dronecode_sdk.h b/core/dronecode_sdk.h → core/include/dronecode_sdk.h
diff --git a/core/plugin_base.h → core/include/plugin_base.h b/core/plugin_base.h → core/include/plugin_base.h
diff --git a/core/system.h → core/include/system.h b/core/system.h → core/include/system.h
diff --git a/create_packages.sh b/create_packages.sh
@@ -18,23 +18,24 @@ common_args="--input-type dir  \
     --force"
 
 library_files="\
-    core/system.h=/usr/include/dronecode_sdk/system.h \
-    core/dronecode_sdk.h=/usr/include/dronecode_sdk/dronecode_sdk.h \
+    core/include/system.h=/usr/include/dronecode_sdk/system.h \
+    core/include/dronecode_sdk.h=/usr/include/dronecode_sdk/dronecode_sdk.h \
     build/default/core/libdronecode_sdk.so=/usr/lib/libdronecode_sdk.so \
-    plugins/action/action.h=/usr/include/dronecode_sdk/action.h \
-    plugins/camera/camera.h=/usr/include/dronecode_sdk/camera.h \
-    plugins/follow_me/follow_me.h=/usr/include/dronecode_sdk/follow_me.h \
-    plugins/gimbal/gimbal.h=/usr/include/dronecode_sdk/gimbal.h \
-    plugins/info/info.h=/usr/include/dronecode_sdk/info.h \
-    plugins/logging/logging.h=/usr/include/dronecode_sdk/logging.h \
-    plugins/mission/mission.h=/usr/include/dronecode_sdk/mission.h \
-    plugins/mission/mission_item.h=/usr/include/dronecode_sdk/mission_item.h \
-    plugins/offboard/offboard.h=/usr/include/dronecode_sdk/offboard.h \
-    plugins/telemetry/telemetry.h=/usr/include/dronecode_sdk/telemetry.h"
+    plugins/action/include/plugins/action/action.h=/usr/include/dronecode_sdk/action.h \
+    plugins/camera/include/plugins/camera/camera.h=/usr/include/dronecode_sdk/camera.h \
+    plugins/follow_me/include/plugins/follow_me/follow_me.h=/usr/include/dronecode_sdk/follow_me.h \
+    plugins/gimbal/include/plugins/gimbal/gimbal.h=/usr/include/dronecode_sdk/gimbal.h \
+    plugins/info/include/plugins/info/info.h=/usr/include/dronecode_sdk/info.h \
+    plugins/logging/include/plugins/logging/logging.h=/usr/include/dronecode_sdk/logging.h \
+    plugins/mission/include/plugins/mission/mission.h=/usr/include/dronecode_sdk/mission.h \
+    plugins/mission/include/plugins/mission/mission_item.h=/usr/include/dronecode_sdk/mission_item.h \
+    plugins/offboard/include/plugins/offboard/offboard.h=/usr/include/dronecode_sdk/offboard.h \
+    plugins/telemetry/include/plugins/telemetry/telemetry.h=/usr/include/dronecode_sdk/telemetry.h \
+    plugins/calibration/include/plugins/calibration/calibration.h=/usr/include/dronecode_sdk/calibration.h"
 
 echo "#!/bin/sh" > run_ldconfig
-echo "/sbin/ldconfig" >> run_ldconfig
 
+echo "/sbin/ldconfig" >> run_ldconfig
 if cat /etc/os-release | grep 'Ubuntu'
 then
     echo "Building DEB package"

diff --git a/plugins/action/CMakeLists.txt b/plugins/action/CMakeLists.txt
@@ -11,9 +11,16 @@ set_target_properties(dronecode_sdk_action
     PROPERTIES COMPILE_FLAGS ${warnings}
 )
 
+target_include_directories(dronecode_sdk_action 
+PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 install(FILES
-    action.h
-    action_result.h
+    include/plugins/action/action.h
+    include/plugins/action/action_result.h
     DESTINATION ${dronecode_sdk_install_include_dir}
 )
 

diff --git a/plugins/action/action.cpp b/plugins/action/action.cpp
@@ -1,4 +1,4 @@
-#include "action.h"
+#include "plugins/action/action.h"
 #include "action_impl.h"
 
 namespace dronecode_sdk {

diff --git a/plugins/action/action_impl.h b/plugins/action/action_impl.h
@@ -2,8 +2,8 @@
 
 #include <cstdint>
 
-#include "action.h"
-#include "action_result.h"
+#include "plugins/action/action.h"
+#include "plugins/action/action_result.h"
 #include "mavlink_include.h"
 #include "plugin_impl_base.h"
 

diff --git a/plugins/action/action.h → ...ns/action/include/plugins/action/action.h b/plugins/action/action.h → ...ns/action/include/plugins/action/action.h
diff --git a/plugins/action/action_result.h → ...on/include/plugins/action/action_result.h b/plugins/action/action_result.h → ...on/include/plugins/action/action_result.h
diff --git a/plugins/action/mocks/action_mock.h b/plugins/action/mocks/action_mock.h
@@ -1,6 +1,6 @@
 #include <gmock/gmock.h>
 
-#include "action/action_result.h"
+#include "plugins/action/action_result.h"
 
 namespace dronecode_sdk {
 namespace testing {

diff --git a/plugins/calibration/CMakeLists.txt b/plugins/calibration/CMakeLists.txt
@@ -13,7 +13,7 @@ set_target_properties(dronecode_sdk_calibration
 )
 
 install(FILES
-    calibration.h
+    include/plugins/calibration/calibration.h
     DESTINATION ${dronecode_sdk_install_include_dir}
 )
 
@@ -22,6 +22,13 @@ install(TARGETS dronecode_sdk_calibration
     DESTINATION ${dronecode_sdk_install_lib_dir}
 )
 
+target_include_directories(dronecode_sdk_calibration
+PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 list(APPEND UNIT_TEST_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/calibration_statustext_parser_test.cpp
 )

diff --git a/plugins/calibration/calibration.cpp b/plugins/calibration/calibration.cpp
@@ -1,4 +1,4 @@
-#include "calibration.h"
+#include "plugins/calibration/calibration.h"
 #include "calibration_impl.h"
 #include "calibration_messages.h"
 

diff --git a/plugins/calibration/calibration_impl.h b/plugins/calibration/calibration_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "calibration.h"
+#include "plugins/calibration/calibration.h"
 #include "system.h"
 #include "mavlink_include.h"
 #include "plugin_impl_base.h"

diff --git a/plugins/calibration/calibration.h → ...include/plugins/calibration/calibration.h b/plugins/calibration/calibration.h → ...include/plugins/calibration/calibration.h
diff --git a/plugins/camera/CMakeLists.txt b/plugins/camera/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
 )
 
 install(FILES
-    camera.h
+    include/plugins/camera/camera.h
     DESTINATION ${dronecode_sdk_install_include_dir}
 )
 
@@ -28,6 +28,13 @@ install(TARGETS dronecode_sdk_camera
     DESTINATION ${dronecode_sdk_install_lib_dir}
 )
 
+target_include_directories(dronecode_sdk_camera 
+PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 list(APPEND UNIT_TEST_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/camera_definition_test.cpp
 )

diff --git a/plugins/camera/camera.cpp b/plugins/camera/camera.cpp
@@ -1,4 +1,4 @@
-#include "camera.h"
+#include "plugins/camera/camera.h"
 #include "camera_impl.h"
 
 namespace dronecode_sdk {

diff --git a/plugins/camera/camera_impl.h b/plugins/camera/camera_impl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system.h"
-#include "camera.h"
+#include "plugins/camera/camera.h"
 #include "plugin_impl_base.h"
 #include "camera_definition.h"
 

diff --git a/plugins/camera/camera.h → ...ns/camera/include/plugins/camera/camera.h b/plugins/camera/camera.h → ...ns/camera/include/plugins/camera/camera.h
diff --git a/plugins/camera/mocks/camera_mock.h b/plugins/camera/mocks/camera_mock.h
@@ -1,6 +1,6 @@
 #include <gmock/gmock.h>
 
-#include "camera/camera.h"
+#include "plugins/camera/camera.h"
 
 namespace dronecode_sdk {
 namespace testing {

diff --git a/plugins/follow_me/CMakeLists.txt b/plugins/follow_me/CMakeLists.txt
@@ -12,11 +12,19 @@ set_target_properties(dronecode_sdk_follow_me
 )
 
 install(FILES
-    follow_me.h
+    include/plugins/follow_me/follow_me.h
     DESTINATION ${dronecode_sdk_install_include_dir}
 )
 
 install(TARGETS dronecode_sdk_follow_me
     #EXPORT dronecode_sdk-targets
     DESTINATION ${dronecode_sdk_install_lib_dir}
 )
+
+target_include_directories(dronecode_sdk_follow_me
+PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
diff --git a/plugins/follow_me/follow_me.cpp b/plugins/follow_me/follow_me.cpp
@@ -1,4 +1,4 @@
-#include "follow_me.h"
+#include "plugins/follow_me/follow_me.h"
 #include "follow_me_impl.h"
 
 namespace dronecode_sdk {

diff --git a/plugins/follow_me/follow_me_impl.h b/plugins/follow_me/follow_me_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "follow_me.h"
+#include "plugins/follow_me/follow_me.h"
 #include "mavlink_include.h"
 #include "plugin_impl_base.h"
 #include "system.h"

diff --git a/plugins/follow_me/follow_me.h → ..._me/include/plugins/follow_me/follow_me.h b/plugins/follow_me/follow_me.h → ..._me/include/plugins/follow_me/follow_me.h
diff --git a/plugins/gimbal/CMakeLists.txt b/plugins/gimbal/CMakeLists.txt
@@ -12,11 +12,18 @@ set_target_properties(dronecode_sdk_gimbal
 )
 
 install(FILES
-    gimbal.h
+    include/plugins/gimbal/gimbal.h
     DESTINATION ${dronecode_sdk_install_include_dir}
 )
 
 install(TARGETS dronecode_sdk_gimbal
     #EXPORT dronecode_sdk-targets
     DESTINATION ${dronecode_sdk_install_lib_dir}
 )
+
+target_include_directories(dronecode_sdk_gimbal
+PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
diff --git a/plugins/gimbal/gimbal.cpp b/plugins/gimbal/gimbal.cpp
@@ -1,4 +1,4 @@
-#include "gimbal.h"
+#include "plugins/gimbal/gimbal.h"
 #include "gimbal_impl.h"
 
 namespace dronecode_sdk {

diff --git a/plugins/gimbal/gimbal_impl.h b/plugins/gimbal/gimbal_impl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system.h"
-#include "gimbal.h"
+#include "plugins/gimbal/gimbal.h"
 #include "plugin_impl_base.h"
 
 namespace dronecode_sdk {

diff --git a/plugins/gimbal/gimbal.h → ...ns/gimbal/include/plugins/gimbal/gimbal.h b/plugins/gimbal/gimbal.h → ...ns/gimbal/include/plugins/gimbal/gimbal.h
diff --git a/plugins/info/CMakeLists.txt b/plugins/info/CMakeLists.txt
@@ -12,11 +12,18 @@ set_target_properties(dronecode_sdk_info
 )
 
 install(FILES
-    info.h
+    include/plugins/info/info.h
     DESTINATION ${dronecode_sdk_install_include_dir}
 )
 
 install(TARGETS dronecode_sdk_info
     #EXPORT dronecode_sdk-targets
     DESTINATION ${dronecode_sdk_install_lib_dir}
 )
+
+target_include_directories(dronecode_sdk_info
+PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
diff --git a/plugins/info/info.h → plugins/info/include/plugins/info/info.h b/plugins/info/info.h → plugins/info/include/plugins/info/info.h
diff --git a/plugins/info/info.cpp b/plugins/info/info.cpp
@@ -1,4 +1,4 @@
-#include "info.h"
+#include "plugins/info/info.h"
 #include "info_impl.h"
 
 namespace dronecode_sdk {

diff --git a/plugins/info/info_impl.h b/plugins/info/info_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "info.h"
+#include "plugins/info/info.h"
 #include "mavlink_include.h"
 #include "plugin_impl_base.h"
 #include <mutex>

diff --git a/plugins/logging/CMakeLists.txt b/plugins/logging/CMakeLists.txt
@@ -12,11 +12,18 @@ set_target_properties(dronecode_sdk_logging
 )
 
 install(FILES
-    logging.h
+    include/plugins/logging/logging.h
     DESTINATION ${dronecode_sdk_install_include_dir}
 )
 
 install(TARGETS dronecode_sdk_logging
     #EXPORT dronecode_sdk-targets
     DESTINATION ${dronecode_sdk_install_lib_dir}
 )
+
+target_include_directories(dronecode_sdk_logging 
+PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
diff --git a/plugins/logging/logging.h → ...logging/include/plugins/logging/logging.h b/plugins/logging/logging.h → ...logging/include/plugins/logging/logging.h
diff --git a/plugins/logging/logging.cpp b/plugins/logging/logging.cpp
@@ -1,4 +1,4 @@
-#include "logging.h"
+#include "plugins/logging/logging.h"
 #include "logging_impl.h"
 
 namespace dronecode_sdk {

diff --git a/plugins/logging/logging_impl.h b/plugins/logging/logging_impl.h
@@ -3,7 +3,7 @@
 #include "plugin_impl_base.h"
 #include "mavlink_include.h"
 #include "system.h"
-#include "logging.h"
+#include "plugins/logging/logging.h"
 
 namespace dronecode_sdk {