Merge pull request RobotLocomotion#1349 from tkoolen/tk-drakeqp-lcm

Require LCM for drakeQP
riverflowo · Sep 17, 2015 · 845f84c · 845f84c
2 parents c0233b1 + b096d40
commit 845f84c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/drake/systems/controllers/CMakeLists.txt b/drake/systems/controllers/CMakeLists.txt
@@ -11,7 +11,7 @@ pods_install_pkg_config_file(drake-control-util
   VERSION 0.0.1)
 
 pods_find_pkg_config(gurobi)
-if (gurobi_FOUND)
+if (gurobi_FOUND AND LCM_FOUND)
   include_directories (${PROJECT_SOURCE_DIR}/systems/trajectories )
   include_directories (${PROJECT_SOURCE_DIR}/systems/plants )
   include_directories (${PROJECT_SOURCE_DIR}/solvers )
@@ -27,7 +27,7 @@ if (gurobi_FOUND)
     VERSION 0.0.1)
 
   pods_find_pkg_config(bot2-lcmgl-client)
-  if (LCM_FOUND AND bot2-lcmgl-client_FOUND)
+  if (bot2-lcmgl-client_FOUND)
     add_executable(zmpCoMObserverStateVisualizer zmpCoMObserverStateVisualizer.cpp)
     pods_use_pkg_config_packages(zmpCoMObserverStateVisualizer lcm bot2-lcmgl-client)
     target_link_libraries(zmpCoMObserverStateVisualizer drake_lcmtypes)