casadi 3.6.3__cp311-none-manylinux2014_i686.whl → 3.6.4__cp311-none-manylinux2014_i686.whl

casadi/casadi.py

@@ -10971,7 +10971,7 @@ class DM(MatrixCommon, GenericExpressionCommon, GenDM, PrintableCommon):
       if "vectorized" in name:
           name = name[:-len(" (vectorized)")]
 
-      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt"}
+      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt", "equal": "eq", "not_equal": "ne"}
       if name in conversion:
         name = conversion[name]
       if len(context[1])==2 and context[1][1] is self and not(context[1][0] is self):
@@ -10983,7 +10983,7 @@ class DM(MatrixCommon, GenericExpressionCommon, GenDM, PrintableCommon):
       return fun(*args[1:])
 
     def __array_ufunc__(self, ufunc, method, *inputs, **kwargs):
-      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt"}
+      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt", "equal": "eq", "not_equal": "ne"}
       name = ufunc.__name__
       inputs = list(inputs)
       if len(inputs)==3:
@@ -11003,7 +11003,13 @@ class DM(MatrixCommon, GenericExpressionCommon, GenDM, PrintableCommon):
         assert method=="__call__"
         fun=getattr(self, name)
         return fun(*inputs[1:])
-      except:
+      except Exception as e:
+        if "Dimension mismatch" in str(e):
+          import sys
+          if sys.version_info[0] < 3:
+              raise RuntimeError(str(e))
+          else:
+              raise e
 #Fall back to numpy conversion
         new_inputs = list(inputs)
         try:
@@ -13338,7 +13344,7 @@ class SX(MatrixCommon, GenericExpressionCommon, GenSX, PrintableCommon):
       if "vectorized" in name:
           name = name[:-len(" (vectorized)")]
 
-      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt"}
+      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt", "equal": "eq", "not_equal": "ne"}
       if name in conversion:
         name = conversion[name]
       if len(context[1])==2 and context[1][1] is self and not(context[1][0] is self):
@@ -13350,7 +13356,7 @@ class SX(MatrixCommon, GenericExpressionCommon, GenSX, PrintableCommon):
       return fun(*args[1:])
 
     def __array_ufunc__(self, ufunc, method, *inputs, **kwargs):
-      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt"}
+      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt", "equal": "eq", "not_equal": "ne"}
       name = ufunc.__name__
       inputs = list(inputs)
       if len(inputs)==3:
@@ -13370,7 +13376,13 @@ class SX(MatrixCommon, GenericExpressionCommon, GenSX, PrintableCommon):
         assert method=="__call__"
         fun=getattr(self, name)
         return fun(*inputs[1:])
-      except:
+      except Exception as e:
+        if "Dimension mismatch" in str(e):
+          import sys
+          if sys.version_info[0] < 3:
+              raise RuntimeError(str(e))
+          else:
+              raise e
 #Fall back to numpy conversion
         new_inputs = list(inputs)
         try:
@@ -16329,7 +16341,7 @@ class MX(GenericExpressionCommon, PrintableCommon, GenMX, SharedObject):
       if "vectorized" in name:
           name = name[:-len(" (vectorized)")]
 
-      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt"}
+      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt", "equal": "eq", "not_equal": "ne"}
       if name in conversion:
         name = conversion[name]
       if len(context[1])==2 and context[1][1] is self and not(context[1][0] is self):
@@ -16341,7 +16353,7 @@ class MX(GenericExpressionCommon, PrintableCommon, GenMX, SharedObject):
       return fun(*args[1:])
 
     def __array_ufunc__(self, ufunc, method, *inputs, **kwargs):
-      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt"}
+      conversion = {"multiply": "mul", "divide": "div", "true_divide": "div", "subtract":"sub","power":"pow","greater_equal":"ge","less_equal": "le", "less": "lt", "greater": "gt", "equal": "eq", "not_equal": "ne"}
       name = ufunc.__name__
       inputs = list(inputs)
       if len(inputs)==3:
@@ -16361,7 +16373,13 @@ class MX(GenericExpressionCommon, PrintableCommon, GenMX, SharedObject):
         assert method=="__call__"
         fun=getattr(self, name)
         return fun(*inputs[1:])
-      except:
+      except Exception as e:
+        if "Dimension mismatch" in str(e):
+          import sys
+          if sys.version_info[0] < 3:
+              raise RuntimeError(str(e))
+          else:
+              raise e
 #Fall back to numpy conversion
         new_inputs = list(inputs)
         try:
@@ -26151,6 +26169,8 @@ def conic(*args) -> "casadi::Function":
 
     - cplex
 
+    - fatrop
+
     - gurobi
 
     - highs
@@ -26309,6 +26329,61 @@ def conic(*args) -> "casadi::Function":
 
 
 
+    --------------------------------------------------------------------------------
+
+    fatrop
+    ------
+
+
+
+    Interface to Fatrop Solver
+
+    In order to use this interface, you must:
+
+    Decision variables must only by state and control, and the variable 
+
+    ordering must be [x0 u0 x1 u1 ...]
+
+    The constraints must be in order: [ gap0 lincon0 gap1 lincon1 ]
+
+    gap: Ak+1 = Ak xk + Bk uk lincon: yk= Ck xk + Dk uk
+
+
+
+    ::
+
+             A0 B0 -I
+             C0 D0
+                    A1 B1 -I
+                    C1 D1
+
+
+
+    where I must be a diagonal sparse matrix
+    Either supply all of N, nx, ng, nu 
+    options or rely on automatic 
+    detection
+
+    Extra doc: https://github.com/casadi/casadi/wiki/L_27g
+
+    >List of available options
+
+    +--------+--------------+-----------------------------------------------+
+    |   Id   |     Type     |                  Description                  |
+    +========+==============+===============================================+
+    | N      | OT_INT       | OCP horizon                                   |
+    +--------+--------------+-----------------------------------------------+
+    | fatrop | OT_DICT      | Options to be passed to fatrop                |
+    +--------+--------------+-----------------------------------------------+
+    | ng     | OT_INTVECTOR | Number of non-dynamic constraints, length N+1 |
+    +--------+--------------+-----------------------------------------------+
+    | nu     | OT_INTVECTOR | Number of controls, length N                  |
+    +--------+--------------+-----------------------------------------------+
+    | nx     | OT_INTVECTOR | Number of states, length N+1                  |
+    +--------+--------------+-----------------------------------------------+
+
+
+
     --------------------------------------------------------------------------------
 
     gurobi
@@ -26372,7 +26447,7 @@ def conic(*args) -> "casadi::Function":
 
 
 
-    Interface to HMPC Solver
+    Interface to HPIPM Solver
 
     In order to use this interface, you must:
 
@@ -27321,6 +27396,7 @@ def nlpsol(*args) -> "casadi::Function":
       nlpsol(str name, str solver, dict:SX nlp, dict opts) -> Function
       nlpsol(str name, str solver, dict:MX nlp, dict opts) -> Function
       nlpsol(str name, str solver, str fname, dict opts) -> Function
+      nlpsol(str name, str solver, Function nlp, dict opts) -> Function
 
 
     .......
@@ -28943,6 +29019,7 @@ def nlpsol(*args) -> "casadi::Function":
       nlpsol(str name, str solver, NlpBuilder nl, dict opts)
       nlpsol(str name, str solver, dict:MX nlp, dict opts)
       nlpsol(str name, str solver, str fname, dict opts)
+      nlpsol(str name, str solver, Function nlp, dict opts)
 
 
 

casadi/cmake/alpaqa/alpaqaConfig.cmake

@@ -0,0 +1,24 @@
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was Config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+####################################################################################
+
+include(CMakeFindDependencyMacro)
+find_dependency(Eigen3 REQUIRED CONFIG)
+if (OFF)
+    find_package(casadi CONFIG)
+endif()
+
+set(ALPAQA_WITH_OCP ON CACHE INTERNAL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/alpaqaTargets.cmake")
+
+if(NOT _alpaqa_PRINTED)
+    get_target_property(ALPAQA_CONFIG alpaqa::alpaqa IMPORTED_CONFIGURATIONS)
+    message(STATUS "Found alpaqa 1.0.0: ${CMAKE_CURRENT_LIST_DIR} (available configs: ${ALPAQA_CONFIG})")
+    set(_alpaqa_PRINTED On CACHE INTERNAL "")
+endif()

casadi/cmake/alpaqa/alpaqaConfigVersion.cmake

@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "1.0.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("1.0.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "1.0.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "4" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "4")
+  math(EXPR installedBits "4 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()

casadi/cmake/alpaqa/alpaqaTargets-release.cmake

@@ -0,0 +1,29 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "alpaqa::alpaqa" for configuration "Release"
+set_property(TARGET alpaqa::alpaqa APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(alpaqa::alpaqa PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libalpaqa.so.1.0.0"
+  IMPORTED_SONAME_RELEASE "libalpaqa.so.1.0.0"
+  )
+
+list(APPEND _cmake_import_check_targets alpaqa::alpaqa )
+list(APPEND _cmake_import_check_files_for_alpaqa::alpaqa "${_IMPORT_PREFIX}/lib/libalpaqa.so.1.0.0" )
+
+# Import target "alpaqa::dl-loader" for configuration "Release"
+set_property(TARGET alpaqa::dl-loader APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(alpaqa::dl-loader PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libalpaqa-dl-loader.so.1.0.0"
+  IMPORTED_SONAME_RELEASE "libalpaqa-dl-loader.so.1.0.0"
+  )
+
+list(APPEND _cmake_import_check_targets alpaqa::dl-loader )
+list(APPEND _cmake_import_check_files_for_alpaqa::dl-loader "${_IMPORT_PREFIX}/lib/libalpaqa-dl-loader.so.1.0.0" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)

casadi/cmake/alpaqa/alpaqaTargets.cmake

@@ -0,0 +1,131 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.22)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS alpaqa::alpaqa alpaqa::dl-api alpaqa::dl-loader alpaqa::warnings)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target alpaqa::alpaqa
+add_library(alpaqa::alpaqa SHARED IMPORTED)
+
+set_target_properties(alpaqa::alpaqa PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "\$<\$<CONFIG:Debug>:EIGEN_INITIALIZE_MATRICES_BY_NAN>;\$<\$<CONFIG:Debug>:EIGEN_RUNTIME_NO_MALLOC>;\$<\$<BOOL:OFF>:ALPAQA_WITH_QUAD_PRECISION>;\$<\$<BOOL:ON>:ALPAQA_WITH_OCP>"
+  INTERFACE_COMPILE_FEATURES "cxx_std_20"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+  INTERFACE_LINK_LIBRARIES "Eigen3::Eigen;\$<\$<BOOL:OFF>:quadmath>"
+)
+
+# Create imported target alpaqa::dl-api
+add_library(alpaqa::dl-api INTERFACE IMPORTED)
+
+set_target_properties(alpaqa::dl-api PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+)
+
+# Create imported target alpaqa::dl-loader
+add_library(alpaqa::dl-loader SHARED IMPORTED)
+
+set_target_properties(alpaqa::dl-loader PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+  INTERFACE_LINK_LIBRARIES "alpaqa::alpaqa;alpaqa::dl-api"
+)
+
+# Create imported target alpaqa::warnings
+add_library(alpaqa::warnings INTERFACE IMPORTED)
+
+set_target_properties(alpaqa::warnings PROPERTIES
+  INTERFACE_COMPILE_OPTIONS "\$<\$<COMPILE_LANGUAGE:C>:>;\$<\$<COMPILE_LANGUAGE:CXX>:>;\$<\$<COMPILE_LANGUAGE:Fortran>:>"
+)
+
+if(CMAKE_VERSION VERSION_LESS 3.0.0)
+  message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/alpaqaTargets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)

casadi/cmake/casadi-config-version.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "3.6.3")
+set(PACKAGE_VERSION "3.6.4")
 
 # Check whether the requested PACKAGE_FIND_VERSION is compatible
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")

casadi/cmake/highs/highs-config.cmake

@@ -1,9 +1,23 @@
-if(NOT TARGET libhighs)
-  include("${CMAKE_CURRENT_LIST_DIR}/highs-targets.cmake")
-endif()
 
-set(HIGHS_LIBRARIES libhighs)
+
+set(HIGHS_DIR "")
+
+if (FAST_BUILD)
+  if(NOT TARGET highs)
+    include("${CMAKE_CURRENT_LIST_DIR}/highs-targets.cmake")
+  endif()
+
+  set(HIGHS_LIBRARIES highs)
+else()
+  if(NOT TARGET libhighs)
+    include("${CMAKE_CURRENT_LIST_DIR}/highs-targets.cmake")
+  endif()
+
+  set(HIGHS_LIBRARIES libhighs)
+endif() 
+
 set(HIGHS_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../../include/highs")
+
 set(HIGHS_FOUND TRUE)
 
 include(CMakeFindDependencyMacro)

casadi/cmake/highs/highs-targets-release.cmake

@@ -17,12 +17,12 @@ list(APPEND _cmake_import_check_files_for_highs "${_IMPORT_PREFIX}/bin/highs" )
 # Import target "libhighs" for configuration "Release"
 set_property(TARGET libhighs APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 set_target_properties(libhighs PROPERTIES
-  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libhighs.so.1.4.0"
-  IMPORTED_SONAME_RELEASE "libhighs.so.1.4"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libhighs.so.1.6.0"
+  IMPORTED_SONAME_RELEASE "libhighs.so.1.6"
   )
 
 list(APPEND _cmake_import_check_targets libhighs )
-list(APPEND _cmake_import_check_files_for_libhighs "${_IMPORT_PREFIX}/lib/libhighs.so.1.4.0" )
+list(APPEND _cmake_import_check_files_for_libhighs "${_IMPORT_PREFIX}/lib/libhighs.so.1.6.0" )
 
 # Commands beyond this point should not need to know the version.
 set(CMAKE_IMPORT_FILE_VERSION)

casadi/cmake/highs/highs-targets.cmake

@@ -59,7 +59,7 @@ endif()
 add_executable(highs IMPORTED)
 
 set_target_properties(highs PROPERTIES
-  INTERFACE_COMPILE_OPTIONS "-Wno-unused-variable;-Wno-unused-const-variable;-Wno-sign-compare"
+  INTERFACE_COMPILE_OPTIONS "-Wno-unused-variable;-Wno-unused-const-variable"
 )
 
 # Create imported target libhighs

casadi/cmake/sleqp/sleqp-config-version.cmake

@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "1.0.1")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("1.0.1" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "1.0.1")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "4" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "4")
+  math(EXPR installedBits "4 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()

casadi/cmake/sleqp/sleqp-config.cmake

@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/sleqp-targets.cmake")

casadi/cmake/sleqp/sleqp-targets-release.cmake

@@ -0,0 +1,20 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "sleqp::sleqp" for configuration "Release"
+set_property(TARGET sleqp::sleqp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(sleqp::sleqp PROPERTIES
+  IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "trlib::trlib"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libsleqp.so.1.0.1"
+  IMPORTED_SONAME_RELEASE "libsleqp.so.1.0.1"
+  )
+
+list(APPEND _cmake_import_check_targets sleqp::sleqp )
+list(APPEND _cmake_import_check_files_for_sleqp::sleqp "${_IMPORT_PREFIX}/lib/libsleqp.so.1.0.1" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)