Merge pull request #460 from bluescarni/pr/ipopt_windows

Try enabling ipopt on the Windows build.
esa · Dec 21, 2020 · 88f884c · 88f884c
2 parents 7c7043f + 0653d6c
commit 88f884c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,13 +7,13 @@ install:
 - set PATH=C:\Miniconda37-x64\Scripts;%PATH%
 - conda config --add channels conda-forge --force
 - conda update --all -y
-- conda create -y --name pagmo python=3.7 cmake boost-cpp eigen nlopt tbb tbb-devel
+- conda create -y --name pagmo python=3.7 cmake boost-cpp eigen nlopt tbb tbb-devel ipopt
 - call activate pagmo
 
 build_script:
 - mkdir build
 - cd build
-- cmake -G "Visual Studio 15 2017 Win64" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%/Library -DPAGMO_BUILD_TESTS=YES -DPAGMO_BUILD_TUTORIALS=YES -DPAGMO_WITH_EIGEN3=yes -DPAGMO_WITH_NLOPT=yes -DPAGMO_ENABLE_IPO=yes ..
+- cmake -G "Visual Studio 15 2017 Win64" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%/Library -DPAGMO_BUILD_TESTS=YES -DPAGMO_BUILD_TUTORIALS=YES -DPAGMO_WITH_EIGEN3=yes -DPAGMO_WITH_NLOPT=yes -DPAGMO_WITH_IPOPT=yes -DPAGMO_ENABLE_IPO=yes ..
 - cmake --build . --config Release --target install
 
 test_script:

diff --git a/cmake_modules/Findpagmo_IPOPT.cmake b/cmake_modules/Findpagmo_IPOPT.cmake
@@ -26,7 +26,7 @@ if ("libipopt" IN_LIST pagmo_IPOPT_FIND_COMPONENTS)
     # The libipopt component was requested.
     # The associated variable is PAGMO_IPOPT_LIBRARY.
     list(APPEND _pagmo_IPOPT_FPHSA_ARGS PAGMO_IPOPT_LIBRARY)
-    find_library(PAGMO_IPOPT_LIBRARY NAMES ipopt)
+    find_library(PAGMO_IPOPT_LIBRARY NAMES ipopt ipopt-3)
 endif()
 
 # Run the standard find_package() machinery.

diff --git a/doc/sphinx/changelog.rst b/doc/sphinx/changelog.rst
@@ -6,6 +6,12 @@ Changelog
 2.16.1 (unreleased)
 -------------------
 
+New
+~~~
+
+- The pagmo conda package now enables Ipopt on Windows
+  (`#460 <https://github.com/esa/pagmo2/pull/460>`__).
+
 Changes
 ~~~~~~~
 
@@ -16,7 +22,8 @@ Fix
 ~~~
 
 - Various build system fixes/improvements
-  (`#459 <https://github.com/esa/pagmo2/pull/459>`__,
+  (`#460 <https://github.com/esa/pagmo2/pull/460>`__,
+  `#459 <https://github.com/esa/pagmo2/pull/459>`__,
   `#458 <https://github.com/esa/pagmo2/pull/458>`__,
   `#457 <https://github.com/esa/pagmo2/pull/457>`__).