Merge pull request #800 from dartsim/ipopt_dart-5.1

Increase minimum required Ipopt version to 3.11.9
dartsim · Oct 17, 2016 · c332ec7 · c332ec7
2 parents 851d60a + d4c72bd
commit c332ec7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -336,7 +336,7 @@ else()
 endif()
 
 # IPOPT
-find_package(IPOPT 3.11.4 QUIET)
+find_package(IPOPT 3.11.9 QUIET)
 if(IPOPT_FOUND)
   message(STATUS "Looking for IPOPT - ${IPOPT_VERSION} found")
   set(HAVE_IPOPT TRUE)

diff --git a/unittests/testOptimizer.cpp b/unittests/testOptimizer.cpp
@@ -182,9 +182,6 @@ TEST(Optimizer, BasicNlopt)
 #ifdef HAVE_IPOPT
 TEST(Optimizer, BasicIpopt)
 {
-  dterr << "Ipopt does not pass this test yet. Please see #153.";
-  return;
-
   std::shared_ptr<Problem> prob = std::make_shared<Problem>(2);
 
   prob->setLowerBounds(Eigen::Vector2d(-HUGE_VAL, 0));