From e3560795a1e2576bbada4e3a13b89bd48ebb7c23 Mon Sep 17 00:00:00 2001
From: TSC21 <n.marques21@hotmail.com>
Date: Mon, 10 Sep 2018 11:32:26 +0100
Subject: [PATCH] make 'build' dir creation optional

---
 msg/tools/generate_microRTPS_bridge.py                       | 5 ++++-
 src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/msg/tools/generate_microRTPS_bridge.py b/msg/tools/generate_microRTPS_bridge.py
index 15e117476e..99cd829197 100644
--- a/msg/tools/generate_microRTPS_bridge.py
+++ b/msg/tools/generate_microRTPS_bridge.py
@@ -68,6 +68,7 @@ parser.add_argument("-r", "--receive", dest='receive', metavar='*.msg', type=str
 parser.add_argument("-a", "--agent", dest='agent', action="store_true", help="Flag for generate the agent, by default is true if -c is not specified")
 parser.add_argument("-c", "--client", dest='client', action="store_true", help="Flag for generate the client, by default is true if -a is not specified")
 parser.add_argument("-i", "--generate-idl", dest='idl', action="store_true", help="Flag for generate idl files for each msg")
+parser.add_argument("-m", "--mkdir-build", dest='mkdir_build', action="store_true", help="Flag to create 'build' dir")
 parser.add_argument("-t", "--topic-msg-dir", dest='msgdir', type=str, help="Topics message dir, by default msg/", default="msg")
 parser.add_argument("-b", "--uorb-templates-dir", dest='uorb_templates', type=str, help="uORB templates dir, by default msg_dir/templates/uorb_microcdr", default=default_uorb_templates_dir)
 parser.add_argument("-q", "--urtps-templates-dir", dest='urtps_templates', type=str, help="uRTPS templates dir, by default msg_dir/templates/urtps", default=default_urtps_templates_dir)
@@ -99,6 +100,7 @@ else:
 agent = args.agent
 client = args.client
 idl = args.idl
+mkdir_build = args.mkdir_build
 del_tree = args.del_tree
 px_generate_uorb_topic_files.append_to_include_path({msg_folder}, px_generate_uorb_topic_files.INCL_DEFAULT, package)
 agent_out_dir = get_absolute_path(args.agentdir)
@@ -201,7 +203,8 @@ def generate_agent(out_dir):
         shutil.rmtree(agent_out_dir + "/fastrtpsgen")
     cp_wildcard(urtps_templates_dir + "/microRTPS_transport.*", agent_out_dir)
     os.rename(agent_out_dir + "/microRTPS_agent_CMakeLists.txt", agent_out_dir + "/CMakeLists.txt")
-    mkdir_p(agent_out_dir + "/build")
+    if (mkdir_build):
+        mkdir_p(agent_out_dir + "/build")
     os.chdir(prev_cwd_path)
     return 0
 
diff --git a/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt b/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt
index 8993b417ba..5b1787c185 100644
--- a/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt
+++ b/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt
@@ -81,6 +81,7 @@ if (NOT "${config_rtps_send_topics}" STREQUAL "" OR NOT "${config_rtps_receive_t
 			${send_topic_opt} ${send_topic_files}
 			${receive_topic_opt} ${receive_topic_files}
 			--generate-idl
+			--mkdir-build
 			--topic-msg-dir ${PX4_SOURCE_DIR}/msg
 			--uorb-templates-dir "/templates/uorb_microcdr"
 			--urtps-templates-dir "/templates/urtps"