Move drake_find_package call and declare system dependency for protobuf

trigrass2 · May 2, 2017 · 330d8d2 · 330d8d2
1 parent 7782a5c
commit 330d8d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/cmake/options.cmake b/cmake/options.cmake
@@ -246,6 +246,10 @@ macro(drake_setup_options)
     DEPENDS "HAVE_LCM"
     "libbot2 robotics suite LCM types")
 
+  drake_system_dependency(
+    PROTOBUF REQUIRES Protobuf
+    "Google protocol buffers")
+
   drake_system_dependency(
     ROBOTLOCOMOTION_LCMTYPES OPTIONAL REQUIRES robotlocomotion-lcmtypes
     DEPENDS "HAVE_BOT_CORE_LCMTYPES"

diff --git a/cmake/packages.cmake b/cmake/packages.cmake
@@ -149,6 +149,7 @@ macro(drake_find_packages)
   set_property(TARGET GMock::GMock APPEND PROPERTY
     INTERFACE_COMPILE_DEFINITIONS ${GTEST_DEFINITIONS})
 
+  drake_find_package(Protobuf MODULE REQUIRED)
   drake_find_package(tinyobjloader CONFIG REQUIRED)
 
   # END required packages

diff --git a/drake/common/CMakeLists.txt b/drake/common/CMakeLists.txt
@@ -2,7 +2,6 @@
 # Drake common library
 #
 
-drake_find_package(Protobuf REQUIRED)
 protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS matlab_rpc.proto)
 
 # Generated code.