no lib prefix for cplex on windows

casadi · Mar 18, 2023 · 9921c68 · 9921c68
1 parent 5ac1453
commit 9921c68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/cplex/generate.py b/cplex/generate.py
@@ -78,25 +78,27 @@ def function_ptr(decl):
     
     #if defined(_WIN32)
     const char library_suffix[] = "dll";
+    const char library_prefix[] = "";
     const char path_env[] = "PATH";
     #elif defined(__APPLE__)
     const char library_suffix[] = "dylib";
+    const char library_prefix[] = "lib";
     const char path_env[] = "DYLD_LIBRARY_PATH";
     #else
     const char library_suffix[] = "so";
+    const char library_prefix[] = "lib";
     const char path_env[] = "LD_LIBRARY_PATH";
     #endif
-    
-    
+   
     if (suffix==NULL) {
         snprintf(err_msg, err_msg_len, "CPLEX load adaptor needs an environmental variable <CPLEX_VERSION> "
-        "such that libcplex<CPLEX_VERSION>.%s can be found.", library_suffix);
+        "such that %scplex<CPLEX_VERSION>.%s can be found.", library_prefix, library_suffix);
         return 1;
     }
 
     char buffer[100];
     
-    snprintf(buffer, 100, "libcplex%s.%s", suffix, library_suffix);
+    snprintf(buffer, 100, "%scplex%s.%s", library_prefix, suffix, library_suffix);
 
     #if defined(_WIN32)
     h = LoadLibrary(TEXT(buffer));

diff --git a/cplex/src/cplex.c b/cplex/src/cplex.c
@@ -69,25 +69,27 @@ int (*CPXXwriteprob)(CPXCENVptr, CPXCLPptr, char const *, char const *) = NULL;
 
     #if defined(_WIN32)
     const char library_suffix[] = "dll";
+    const char library_prefix[] = "";
     const char path_env[] = "PATH";
     #elif defined(__APPLE__)
     const char library_suffix[] = "dylib";
+    const char library_prefix[] = "lib";
     const char path_env[] = "DYLD_LIBRARY_PATH";
     #else
     const char library_suffix[] = "so";
+    const char library_prefix[] = "lib";
     const char path_env[] = "LD_LIBRARY_PATH";
     #endif
-
-
+
     if (suffix==NULL) {
         snprintf(err_msg, err_msg_len, "CPLEX load adaptor needs an environmental variable <CPLEX_VERSION> "
-        "such that libcplex<CPLEX_VERSION>.%s can be found.", library_suffix);
+        "such that %scplex<CPLEX_VERSION>.%s can be found.", library_prefix, library_suffix);
         return 1;
     }
 
     char buffer[100];
 
-    snprintf(buffer, 100, "libcplex%s.%s", suffix, library_suffix);
+    snprintf(buffer, 100, "%scplex%s.%s", library_prefix, suffix, library_suffix);
 
     #if defined(_WIN32)
     h = LoadLibrary(TEXT(buffer));