version compatible with osx M1

.gitignore

@@ -2,7 +2,9 @@
 *.mw
 *.DS_Store
 .vscode
+*.dylib
+*.mex*
 IPOPT-toolbox.mltbx
 /doc
 /coinbrew
-
+/toolbox/build

IPOPT-toolbox.prj

@@ -7,7 +7,7 @@
     <param.summary>Toolbox for MATLAB interfacing with IPOPT</param.summary>
     <param.description>Toolbox for MATLAB interfacing with IPOPT</param.description>
     <param.screenshot>${PROJECT_ROOT}/toolbox/screenshot.png</param.screenshot>
-    <param.version>1.1.5</param.version>
+    <param.version>1.1.6</param.version>
     <param.output>${PROJECT_ROOT}/IPOPT-toolbox.mltbx</param.output>
     <param.products.name />
     <param.products.id />
@@ -98,8 +98,11 @@
       <file>${PROJECT_ROOT}/toolbox</file>
     </fileset.rootdir>
     <fileset.rootfiles>
+      <file>${PROJECT_ROOT}/toolbox/CMakeLists.txt</file>
       <file>${PROJECT_ROOT}/toolbox/CompileIpoptMexLib.m</file>
       <file>${PROJECT_ROOT}/toolbox/bin</file>
+      <file>${PROJECT_ROOT}/toolbox/build</file>
+      <file>${PROJECT_ROOT}/toolbox/cmake_utils</file>
       <file>${PROJECT_ROOT}/toolbox/demos.xml</file>
       <file>${PROJECT_ROOT}/toolbox/doc</file>
       <file>${PROJECT_ROOT}/toolbox/examples</file>

toolbox/CMakeLists.txt

@@ -1,9 +1,9 @@
 #-----------------------------------------------------------------------#
 #  file: CMakeLists.txt                                                 #
 #                                                                       #
-#  version: 1.0   date 9/3/2022                                         #
+#  version: 1.0  date March, 21, 2023                                   #
 #                                                                       #
-#  Copyright (C) 2022                                                   #
+#  Copyright (C) 2023                                                   #
 #                                                                       #
 #      Enrico Bertolazzi                                                #
 #      Dipartimento di Ingegneria Industriale                           #
@@ -47,43 +47,41 @@ message( STATUS "Compiler used: ${CMAKE_CXX_COMPILER_ID}" )
 message( STATUS "BASE SUFFIXES = ${ARTIFACTS_STATIC_SUFFIX} ${ARTIFACTS_DYNAMIC_SUFFIX}" )
 
 # extra include directory for compilation
-include_directories( src src_ipopt_osx/coin-or )
+include_directories( src )
 
-message( STATUS "SOURCES = ${SOURCES}" )
-
-#   _____                  _
-#  |_   _|_ _ _ _ __ _ ___| |_ ___
-#    | |/ _` | '_/ _` / -_)  _(_-<
-#    |_|\__,_|_| \__, \___|\__/__/
-#                |___/
-#
-
-utils_final_messages()
-
-message( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
-if ( CMAKE_BUILD_TYPE MATCHES Debug )
-  message( STATUS "DEBUG MODE\n\n")
-  add_compile_definitions(DEBUG)
+if ( (UNIX OR LINUX) AND NOT APPLE )
+  include_directories( src_ipopt_linux/coin-or )
+  set( MEXNAME ipopt_linux )
+elseif ( APPLE )
+  include_directories( src_ipopt_osx/coin-or )
+  set(CMAKE_MACOSX_RPATH 1)
+  set(CMAKE_INSTALL_RPATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/osx )
+  set( MEXNAME ipopt_osx )
+else()
+  include_directories( src_ipopt_win/coin-or )
+  set( MEXNAME ipopt_win )
 endif()
 
-set(CMAKE_MACOSX_RPATH 1)
-set(CMAKE_INSTALL_RPATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/osx )
+utils_final_messages()
 
 matlab_add_mex(
-  NAME ipopt_osx
+  NAME ${MEXNAME}
   SRC src/ipopt.cc src/IpoptInterfaceCommon.cc
-  LINK_TO -L${CMAKE_CURRENT_SOURCE_DIR}/bin/osx -lblas -ldmumps
-  ${CMAKE_CURRENT_SOURCE_DIR}/bin/osx/libgcc_s.1.dylib
-  -lgfortran.5
-  -lipopt.3
-  -lipoptamplinterface.3
-  -llapack
-  -lmpiseq
-  -lmumps_common
-  -lopenblas.0
-  -lpord
-  -lquadmath.0
-  -lsipopt.3
-  -lstdc++.6
-OUTPUT_NAME ipopt_osx
+  LINK_TO -L${CMAKE_CURRENT_SOURCE_DIR}/bin/osx
+          -lblas
+          -ldmumps
+          -lgcc_s.1
+          -lgcc_s.1.1
+          -lgfortran.5
+          -lipopt.3
+          -lipoptamplinterface.3
+          -llapack
+          -lmpiseq
+          -lmumps_common
+          -lopenblas.0
+          -lpord
+          -lquadmath.0
+          -lsipopt.3
+          -lstdc++.6
+  OUTPUT_NAME ${MEXNAME}
 )

toolbox/bin/osx/copy_dylib.rb

@@ -25,6 +25,7 @@
   'libgfortran.5.dylib',
   'libquadmath.0.dylib',
   'libstdc++.6.dylib',
+  'libgomp.1.dylib',
   'libgcc_s.1.dylib',
   'libgcc_s.1.1.dylib'
 ].each do |lib|

toolbox/bin/osx/filter_dylib.rb

@@ -5,6 +5,7 @@
 LIST = %w(
 libblas
 libdmumps
+libgomp.1
 libgcc_s.1
 libgcc_s.1.1
 libgfortran.5

toolbox/examples/test_BartholomewBiggs.m

@@ -28,7 +28,7 @@
   %options.ipopt.linear_solver    = 'ma57';
   %options.ipopt.linear_solver    = 'ma77';
   %options.ipopt.linear_solver    = 'ma86';
-  %options.ipopt.linear_solver    = 'ma97';
+  options.ipopt.linear_solver    = 'ma97';
 
   % PARDISO solver
   % to use this solvers see README_HSL.md