Skip to content

Commit

Permalink
Merge pull request RobotLocomotion#4301 from jamiesnape/redundant-pod…
Browse files Browse the repository at this point in the history
…s-find-pkg-config

Remove redundant pods_find_pkg_config calls
  • Loading branch information
jamiesnape authored Nov 30, 2016
2 parents 3571666 + a31455e commit 825ce6d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
5 changes: 2 additions & 3 deletions drake/solvers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,12 @@ list(APPEND optimization_files
moby_lcp_solver.cc
system_identification.cc
)
pods_find_pkg_config(ipopt)
if (ipopt_FOUND)
if(ipopt_FOUND)
list(APPEND optimization_files ipopt_solver.cc)
list(APPEND optimization_requires ipopt)
else()
list(APPEND optimization_files no_ipopt.cc)
endif(ipopt_FOUND)
endif()
if(NLopt_FOUND)
list(APPEND optimization_files nlopt_solver.cc)
list(APPEND optimization_requires nlopt)
Expand Down
1 change: 0 additions & 1 deletion drake/systems/controllers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ if(gurobi_FOUND AND lcm_FOUND AND yaml-cpp_FOUND)
eigen3
lcm)

pods_find_pkg_config(bot2-lcmgl-client)
if(bot2-lcmgl-client_FOUND)
add_executable(zmpCoMObserverStateVisualizer zmpCoMObserverStateVisualizer.cpp)
pods_use_pkg_config_packages(zmpCoMObserverStateVisualizer bot2-lcmgl-client)
Expand Down

0 comments on commit 825ce6d

Please sign in to comment.