diff --git a/action.yml b/action.yml index 3b66cd6..9dbf553 100644 --- a/action.yml +++ b/action.yml @@ -9,7 +9,7 @@ runs: using: "composite" steps: - run: | - curl -OL https://github.com/casadi/mockups/releases/download/v43/mockups_${{ inputs.tag }}.zip + curl -OL https://github.com/casadi/mockups/releases/download/v44/mockups_${{ inputs.tag }}.zip unzip mockups_${{ inputs.tag }}.zip -d mockups ls mockups ls mockups/cmake diff --git a/cplex/generate.py b/cplex/generate.py index 46b8582..042cac3 100644 --- a/cplex/generate.py +++ b/cplex/generate.py @@ -26,7 +26,7 @@ def get_name(decl): def function_ptr(decl): return decl[:-1].replace(get_name(decl),"(*)") -with open("include/cplex.h","w") as fout: +with open("include/ilcplex/cplexx.h","w") as fout: fout.write("".join(preamble)) for decl in method_declarations: fout.write("#define %s adaptor_%s\n" % (get_name(decl),get_name(decl))) @@ -39,7 +39,7 @@ def function_ptr(decl): fout.write(""" #define DLL_IMPLEMENTATION -#include "cplex.h" +#include "ilcplex/cplexx.h" #include #include diff --git a/cplex/include/cplex.h b/cplex/include/ilcplex/cplexx.h similarity index 100% rename from cplex/include/cplex.h rename to cplex/include/ilcplex/cplexx.h diff --git a/cplex/src/cplex.c b/cplex/src/cplex.c index a07800c..b1856aa 100644 --- a/cplex/src/cplex.c +++ b/cplex/src/cplex.c @@ -1,6 +1,6 @@ #define DLL_IMPLEMENTATION -#include "cplex.h" +#include "ilcplex/cplexx.h" #include #include @@ -391,4 +391,4 @@ int (*CPXXwriteprob)(CPXCENVptr, CPXCLPptr, char const *, char const *) = NULL; return 1; } } - \ No newline at end of file +