Fix consistent include path for installed targets

Former-commit-id: 5575e4e69d4e3b67d2c8486f899ea6458c2a3313 [formerly fdd9ce4] Former-commit-id: f09b0edb047208d2ab23bcf63c3afa17627e8545
MRPT · Jun 6, 2022 · cb2273e · cb2273e
1 parent 9aca20c
commit cb2273e
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -282,3 +282,4 @@ docs/requirements.txt
 docs/myenv
 *.autosave
 docs/html
+.vscode
diff --git a/modules/comms/include/mvsim/Comms/Server.h b/modules/comms/include/mvsim/Comms/Server.h
@@ -21,14 +21,14 @@
 
 #if defined(MVSIM_HAS_ZMQ) && defined(MVSIM_HAS_PROTOBUF)
 
-#include "AdvertiseServiceRequest.pb.h"
-#include "AdvertiseTopicRequest.pb.h"
-#include "GetServiceInfoRequest.pb.h"
-#include "ListNodesRequest.pb.h"
-#include "ListTopicsRequest.pb.h"
-#include "RegisterNodeRequest.pb.h"
-#include "SubscribeRequest.pb.h"
-#include "UnregisterNodeRequest.pb.h"
+#include <mvsim/mvsim-msgs/AdvertiseServiceRequest.pb.h>
+#include <mvsim/mvsim-msgs/AdvertiseTopicRequest.pb.h>
+#include <mvsim/mvsim-msgs/GetServiceInfoRequest.pb.h>
+#include <mvsim/mvsim-msgs/ListNodesRequest.pb.h>
+#include <mvsim/mvsim-msgs/ListTopicsRequest.pb.h>
+#include <mvsim/mvsim-msgs/RegisterNodeRequest.pb.h>
+#include <mvsim/mvsim-msgs/SubscribeRequest.pb.h>
+#include <mvsim/mvsim-msgs/UnregisterNodeRequest.pb.h>
 
 #endif
 

diff --git a/modules/comms/src/Comms/Client.cpp b/modules/comms/src/Comms/Client.cpp
@@ -28,21 +28,21 @@
 
 #include <zmq.hpp>
 
-#include "AdvertiseServiceRequest.pb.h"
-#include "AdvertiseTopicRequest.pb.h"
-#include "CallService.pb.h"
-#include "GenericAnswer.pb.h"
-#include "GetServiceInfoAnswer.pb.h"
-#include "GetServiceInfoRequest.pb.h"
-#include "ListNodesAnswer.pb.h"
-#include "ListNodesRequest.pb.h"
-#include "ListTopicsAnswer.pb.h"
-#include "ListTopicsRequest.pb.h"
-#include "RegisterNodeAnswer.pb.h"
-#include "RegisterNodeRequest.pb.h"
-#include "SubscribeAnswer.pb.h"
-#include "SubscribeRequest.pb.h"
-#include "UnregisterNodeRequest.pb.h"
+#include <mvsim/mvsim-msgs/AdvertiseServiceRequest.pb.h>
+#include <mvsim/mvsim-msgs/AdvertiseTopicRequest.pb.h>
+#include <mvsim/mvsim-msgs/CallService.pb.h>
+#include <mvsim/mvsim-msgs/GenericAnswer.pb.h>
+#include <mvsim/mvsim-msgs/GetServiceInfoAnswer.pb.h>
+#include <mvsim/mvsim-msgs/GetServiceInfoRequest.pb.h>
+#include <mvsim/mvsim-msgs/ListNodesAnswer.pb.h>
+#include <mvsim/mvsim-msgs/ListNodesRequest.pb.h>
+#include <mvsim/mvsim-msgs/ListTopicsAnswer.pb.h>
+#include <mvsim/mvsim-msgs/ListTopicsRequest.pb.h>
+#include <mvsim/mvsim-msgs/RegisterNodeAnswer.pb.h>
+#include <mvsim/mvsim-msgs/RegisterNodeRequest.pb.h>
+#include <mvsim/mvsim-msgs/SubscribeAnswer.pb.h>
+#include <mvsim/mvsim-msgs/SubscribeRequest.pb.h>
+#include <mvsim/mvsim-msgs/UnregisterNodeRequest.pb.h>
 
 #endif
 

diff --git a/modules/comms/src/Comms/Server.cpp b/modules/comms/src/Comms/Server.cpp
@@ -18,17 +18,17 @@
 #if defined(MVSIM_HAS_ZMQ) && defined(MVSIM_HAS_PROTOBUF)
 #include <zmq.hpp>
 
-#include "GenericAnswer.pb.h"
-#include "GetServiceInfoAnswer.pb.h"
-#include "ListNodesAnswer.pb.h"
-#include "ListNodesRequest.pb.h"
-#include "ListTopicsAnswer.pb.h"
-#include "ListTopicsRequest.pb.h"
-#include "RegisterNodeAnswer.pb.h"
-#include "RegisterNodeRequest.pb.h"
-#include "SubscribeAnswer.pb.h"
-#include "SubscribeRequest.pb.h"
-#include "UnregisterNodeRequest.pb.h"
+#include <mvsim/mvsim-msgs/GenericAnswer.pb.h>
+#include <mvsim/mvsim-msgs/GetServiceInfoAnswer.pb.h>
+#include <mvsim/mvsim-msgs/ListNodesAnswer.pb.h>
+#include <mvsim/mvsim-msgs/ListNodesRequest.pb.h>
+#include <mvsim/mvsim-msgs/ListTopicsAnswer.pb.h>
+#include <mvsim/mvsim-msgs/ListTopicsRequest.pb.h>
+#include <mvsim/mvsim-msgs/RegisterNodeAnswer.pb.h>
+#include <mvsim/mvsim-msgs/RegisterNodeRequest.pb.h>
+#include <mvsim/mvsim-msgs/SubscribeAnswer.pb.h>
+#include <mvsim/mvsim-msgs/SubscribeRequest.pb.h>
+#include <mvsim/mvsim-msgs/UnregisterNodeRequest.pb.h>
 
 #endif
 

diff --git a/modules/msgs/CMakeLists.txt b/modules/msgs/CMakeLists.txt
@@ -42,7 +42,7 @@ if (MVSIM_WITH_PROTOBUF)
 
 	target_include_directories(${PROJECT_NAME}
 		SYSTEM PUBLIC
-			$<BUILD_INTERFACE:${Protobuf_INCLUDE_DIRS}>
+			#$<BUILD_INTERFACE:${Protobuf_INCLUDE_DIRS}>
 			$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 			$<INSTALL_INTERFACE:include>
 	)

diff --git a/modules/simulator/src/Sensors/SensorBase.cpp b/modules/simulator/src/Sensors/SensorBase.cpp
@@ -23,7 +23,7 @@
 #include "xml_utils.h"
 
 #if defined(MVSIM_HAS_ZMQ) && defined(MVSIM_HAS_PROTOBUF)
-#include "GenericObservation.pb.h"
+#include <mvsim/mvsim-msgs/GenericObservation.pb.h>
 #endif
 
 using namespace mvsim;

diff --git a/modules/simulator/src/Simulable.cpp b/modules/simulator/src/Simulable.cpp
@@ -16,7 +16,7 @@
 #include "xml_utils.h"
 
 #if defined(MVSIM_HAS_ZMQ) && defined(MVSIM_HAS_PROTOBUF)
-#include "TimeStampedPose.pb.h"
+#include <mvsim/mvsim-msgs/TimeStampedPose.pb.h>
 
 #endif
 

diff --git a/modules/simulator/src/World.cpp b/modules/simulator/src/World.cpp
@@ -14,11 +14,11 @@
 #include <map>
 #include <stdexcept>
 
-#include "GenericAnswer.pb.h"
-#include "SrvGetPose.pb.h"
-#include "SrvGetPoseAnswer.pb.h"
-#include "SrvSetPose.pb.h"
-#include "SrvSetPoseAnswer.pb.h"
+#include <mvsim/mvsim-msgs/GenericAnswer.pb.h>
+#include <mvsim/mvsim-msgs/SrvGetPose.pb.h>
+#include <mvsim/mvsim-msgs/SrvGetPoseAnswer.pb.h>
+#include <mvsim/mvsim-msgs/SrvSetPose.pb.h>
+#include <mvsim/mvsim-msgs/SrvSetPoseAnswer.pb.h>
 
 using namespace mvsim;
 using namespace std;