More helpful error messages for adaptors

casadi · Mar 20, 2023 · 8126a64 · 8126a64
1 parent 462e208
commit 8126a64
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/cplex/generate.py b/cplex/generate.py
@@ -142,8 +142,8 @@ def function_ptr(decl):
       
       return 0;
     } else {
-      snprintf(err_msg, err_msg_len, "Could not find library '%s'. "
-        "Consider adding the appropriate cplex folder to environmental variable '%s'.", buffer, path_env);
+      snprintf(err_msg, err_msg_len, "Could not find library '%s' (%scplex<CPLEX_VERSION>.%s). "
+        "Consider adding the appropriate cplex folder to environmental variable '%s', or specifying a different variable 'CPLEX_VERSION'.", buffer, library_prefix, library_suffix, path_env);
       return 1;
     }
   }

diff --git a/cplex/src/cplex.c b/cplex/src/cplex.c
@@ -388,8 +388,8 @@ int (*CPXXwriteprob)(CPXCENVptr, CPXCLPptr, char const *, char const *) = NULL;
 
       return 0;
     } else {
-      snprintf(err_msg, err_msg_len, "Could not find library '%s'. "
-        "Consider adding the appropriate cplex folder to environmental variable '%s'.", buffer, path_env);
+      snprintf(err_msg, err_msg_len, "Could not find library '%s' (%scplex<CPLEX_VERSION>.%s). "
+        "Consider adding the appropriate cplex folder to environmental variable '%s', or specifying a different variable 'CPLEX_VERSION'.", buffer, library_prefix, library_suffix, path_env);
       return 1;
     }
   }

diff --git a/gurobi/generate.py b/gurobi/generate.py
@@ -130,8 +130,8 @@ def function_ptr(decl):
       
       return 0;
     } else {
-      snprintf(err_msg, err_msg_len, "Could not find library '%s'. "
-        "Consider adding the appropriate gurobi folder to environmental variable '%s'.", buffer, path_env);
+      snprintf(err_msg, err_msg_len, "Could not find library '%s' (%sgurobi<GUROBI_VERSION>.%s). "
+        "Consider adding the appropriate gurobi folder to environmental variable '%s', or specifying a different variable 'CPLEX_VERSION'.", buffer, library_prefix, library_suffix, path_env);
       return 1;
     }
   }

diff --git a/gurobi/src/gurobi.c b/gurobi/src/gurobi.c
@@ -185,8 +185,8 @@ int (*GRBupdatemodel)(GRBmodel *) = NULL;
 
       return 0;
     } else {
-      snprintf(err_msg, err_msg_len, "Could not find library '%s'. "
-        "Consider adding the appropriate gurobi folder to environmental variable '%s'.", buffer, path_env);
+      snprintf(err_msg, err_msg_len, "Could not find library '%s' (%sgurobi<GUROBI_VERSION>.%s). "
+        "Consider adding the appropriate gurobi folder to environmental variable '%s', or specifying a different variable 'CPLEX_VERSION'.", buffer, library_prefix, library_suffix, path_env);
       return 1;
     }
   }