[casadi] Update to v3.7.2 (#49286)

2026-01-18 01:11:23 +01:00 · 2026-01-08 23:32:33 -05:00
parent 36df77d168
commit d4d51d2f22
7 changed files with 28 additions and 99 deletions
--- a/ports/casadi/disable_fortran.patch
+++ b/ports/casadi/disable_fortran.patch
@@ -1,28 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0200a56df..69b699626 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -84,23 +84,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-   set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type (default Release)" FORCE)
- endif()
- 
-########################################################################
-############################# Fortran ##################################
-########################################################################
-option(FORTRAN_REQUIRED "Make fortran a required dependency" OFF)
-
-# http://public.kitware.com/Bug/print_bug_page.php?bug_id=9220
- set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-include(language_support)
-workaround_9220(Fortran Fortran_language_works)
-if(FORTRAN_REQUIRED)
-  enable_language(Fortran)
-  set(Fortran_language_works ON)
-else()
-  if(Fortran_language_works)
-    enable_language(Fortran OPTIONAL)
-  endif()
-endif()
- 
- ########################################################################
- ############################# C++11 ####################################
--- a/ports/casadi/namespace.cmake
+++ b/ports/casadi/namespace.cmake
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 96acbc2e5..f2a08c83d 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2167,7 +2167,7 @@ install(FILES
- 
- # Install the export set for use with the install-tree
- file(RELATIVE_PATH REL_CMAKE_PREFIX "${CMAKE_INSTALL_PREFIX}" "${CMAKE_PREFIX}")
-install(EXPORT casadi-targets DESTINATION ${REL_CMAKE_PREFIX})
-+install(EXPORT casadi-targets NAMESPACE casadi:: DESTINATION ${REL_CMAKE_PREFIX})
- 
- set(CPACK_PACKAGE_CONTACT "casadi-users@googlegroups.com")
- set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION_FULL})
-diff --git a/docs/examples/cplusplus/cmake_find_package/CMakeLists.txt b/docs/examples/cplusplus/cmake_find_package/CMakeLists.txt
--- a/ports/casadi/portfile.cmake
+++ b/ports/casadi/portfile.cmake
@@ -1,18 +1,32 @@
-# Currently no upstream support for static libraries
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO casadi/casadi
    REF "${VERSION}"
-    SHA512 2c95368281f0bda385c6c451e361c168589f13aa66af6bc6fadf01f899bcd6c785ea7da3dee0fb5835559e58982e499182a4d244af3ea208ac05f672ea99cfd1
+    SHA512 ebd1d91f18b29620c8898fd014e35eefce2d621f9a698a14454b478cded78087bffa3651d808908a16ed8864571c7ddae99e387e53cb79a451ca60a8d690c8bb
    HEAD_REF main
-    PATCHES relocatable.patch disable_fortran.patch namespace.cmake
 )

+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    set(ENABLE_SHARED ON)
+    set(ENABLE_STATIC OFF)
+else()
+    set(ENABLE_SHARED OFF)
+    set(ENABLE_STATIC ON)
+endif()
+
+# Do not build deepbind on unsupported platforms
+if(VCPKG_TARGET_IS_ANDROID)
+    set(WITH_DEEPBIND OFF)
+else()
+    set(WITH_DEEPBIND ON)
+endif()
+
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
+     -DENABLE_STATIC=${ENABLE_STATIC}
+     -DENABLE_SHARED=${ENABLE_SHARED}
+     -DWITH_DEEPBIND=${WITH_DEEPBIND}
     -DWITH_SELFCONTAINED=OFF
     -DWITH_TINYXML=OFF
     -DWITH_BUILD_TINYXML=OFF
--- a/ports/casadi/relocatable.patch
+++ b/ports/casadi/relocatable.patch
@@ -1,47 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b444c292e..0200a56df 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -297,6 +297,7 @@ option(ENABLE_STATIC "Compile static libraries (.a on Linux)" OFF)
- option(ENABLE_SHARED "Compile shared libraries (.so on Linux)" ON)
- option(SWIG_EXPORT "Export SWIG" OFF)
- option(SWIG_IMPORT "Import SWIG" OFF)
-+option(RELOCATABLE "Avoid any usage of absolute paths" ON)
- 
- # enabling OpenMP support if requested
- option(WITH_OPENMP "Compile with parallelization support using OpenMP" OFF)
-diff --git a/casadi/CMakeLists.txt b/casadi/CMakeLists.txt
-index 3c803afc0..bd408fdd6 100644
--- a/casadi/CMakeLists.txt
-+++ b/casadi/CMakeLists.txt
-@@ -141,10 +141,16 @@ if(NOT SKIP_CONFIG_H_GENERATION)
- 
-   # See issue #3831, RELOCATABILITY
-   set(CASADI_CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER})
-  if(CASADI_CMAKE_CXX_COMPILER MATCHES "shims")
-+  if(CASADI_CMAKE_CXX_COMPILER MATCHES "shims" OR RELOCATABLE)
-     get_filename_component(CASADI_CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER} NAME)
-   endif()
- 
-+  if(RELOCATABLE)
-+    set(CASADI_INSTALL_PREFIX "")
-+  else()
-+    set(CASADI_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-+  endif()
-+
-   configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h" ESCAPE_QUOTES)
- endif()
- install(FILES casadi.hpp mem.h casadi_c.h "${CMAKE_CURRENT_BINARY_DIR}/config.h"
-diff --git a/casadi/config.h.cmake b/casadi/config.h.cmake
-index 2b805aede..3a4795eb2 100644
--- a/casadi/config.h.cmake
-+++ b/casadi/config.h.cmake
-@@ -38,7 +38,7 @@
- #define CASADI_COMPILER_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}} ${EXTRA_CXX_FLAGS_FROM_DEFS}"  // NOLINT(whitespace/line_length)
- #define CASADI_MODULES "${CASADI_MODULES}"  // NOLINT(whitespace/line_length)
- #define CASADI_PLUGINS "${CASADI_PLUGINS}"  // NOLINT(whitespace/line_length)
-#define CASADI_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"  // NOLINT(whitespace/line_length)
-+#define CASADI_INSTALL_PREFIX "${CASADI_INSTALL_PREFIX}"  // NOLINT(whitespace/line_length)
- #define CASADI_SHARED_LIBRARY_PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}"  // NOLINT(whitespace/line_length)
- #define CASADI_SHARED_LIBRARY_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}"  // NOLINT(whitespace/line_length)
- #define CASADI_OBJECT_FILE_SUFFIX "${CMAKE_C_OUTPUT_EXTENSION}"  // NOLINT(whitespace/line_length)
--- a/ports/casadi/vcpkg.json
+++ b/ports/casadi/vcpkg.json
@@ -1,11 +1,10 @@
 {
  "name": "casadi",
-  "version": "3.6.7",
-  "port-version": 1,
+  "version": "3.7.2",
  "description": "CasADi is a symbolic framework for numeric optimization implementing automatic differentiation in forward and reverse modes on sparse matrix-valued computational graphs. It supports self-contained C-code generation and interfaces state-of-the-art codes such as SUNDIALS, IPOPT etc. It can be used from C++, Python or Matlab/Octave.",
  "homepage": "https://web.casadi.org",
  "license": "LGPL-3.0-only",
-  "supports": "!static & !uwp",
+  "supports": "!uwp",
  "dependencies": [
    {
      "name": "vcpkg-cmake",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1601,8 +1601,8 @@
      "port-version": 0
    },
    "casadi": {
-      "baseline": "3.6.7",
-      "port-version": 1
+      "baseline": "3.7.2",
+      "port-version": 0
    },
    "casclib": {
      "baseline": "2024-06-05",
--- a/versions/c-/casadi.json
+++ b/versions/c-/casadi.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "ec672097caf5dfd8a61b67b88000ffe18b78d31a",
+      "version": "3.7.2",
+      "port-version": 0
+    },
    {
      "git-tree": "41671a156bc091a5740da4900f0a4fcf7679c53b",
      "version": "3.6.7",