From f9c54b0cc1794076c04f25a970c86868bc747348 Mon Sep 17 00:00:00 2001
From: Christopher Richardson <christopher.richardson@gtri.gatech.edu>
Date: Wed, 19 Sep 2018 15:10:17 -0400
Subject: [PATCH] fix bug in msgs cmake

- fix a bug in proto path in /msgs for non-GRPC build
- add compiler flag to BoundaryDefense plugin that causes
build failure on some systems
---
 msgs/CMakeLists.txt                                 | 3 ++-
 src/plugins/autonomy/BoundaryDefense/CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/msgs/CMakeLists.txt b/msgs/CMakeLists.txt
index b4b9315c8c..c823344eb9 100644
--- a/msgs/CMakeLists.txt
+++ b/msgs/CMakeLists.txt
@@ -19,6 +19,7 @@ foreach(PROTO_FILE ${PROTO_FILE_LIST})
   get_filename_component(PROTO_NAME ${PROTO_FILE} NAME_WE)
   get_filename_component(ABS_PROTO_NAME ${PROTO_FILE} REALPATH)
   get_filename_component(PROTO_PATH ${ABS_PROTO_NAME} DIRECTORY)
+  get_filename_component(SCRIMMAGE_PROTO_PATH ${SCRIMMAGE_PROTO_PATH} REALPATH)
 
   set(PROTO_FILE_GEN_CPP_FILES
     ${GEN_DIR}/${PROTO_NAME}.pb.cc
@@ -54,7 +55,7 @@ foreach(PROTO_FILE ${PROTO_FILE_LIST})
   else()
     add_custom_command(
       OUTPUT ${PROTO_FILE_GEN_FILES}
-      COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} ${ABS_PROTO_NAME} --proto_path=${PROTO_PATH} --cpp_out=${GEN_DIR} --python_out=${GEN_DIR}
+      COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} ${ABS_PROTO_NAME} --proto_path=${PROTO_PATH} --proto_path=${SCRIMMAGE_PROTO_PATH} --cpp_out=${GEN_DIR} --python_out=${GEN_DIR}
       DEPENDS ${PROTO_FILE}
       WORKING_DIRECTORY ${PROTO_PATH}
       )
diff --git a/src/plugins/autonomy/BoundaryDefense/CMakeLists.txt b/src/plugins/autonomy/BoundaryDefense/CMakeLists.txt
index 6de6caf206..0ab4887b70 100644
--- a/src/plugins/autonomy/BoundaryDefense/CMakeLists.txt
+++ b/src/plugins/autonomy/BoundaryDefense/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(${LIBRARY_NAME} SHARED
 )
 
 target_compile_options(${LIBRARY_NAME}
-  PRIVATE -Wall -Wno-return-type-c-linkage -std=c++14
+  PRIVATE -Wall -Wno-return-type-c-linkage -std=c++14 -fext-numeric-literals
 )
 
 target_link_libraries(${LIBRARY_NAME}