Former-commit-id: eb5b63d1f48886385d259374699df8c9701771e6
@@ -26,7 +26,9 @@ IGL_INLINE bool igl::mosek::mosek_linprog(
// Create the MOSEK environment
mosek_guarded(MSK_makeenv(&env,NULL));
// initialize mosek environment
+#if MSK_VERSION_MAJOR <= 7
mosek_guarded(MSK_initenv(env));
+#endif
const bool ret = mosek_linprog(c,A,lc,uc,lx,ux,env,x);
MSK_deleteenv(&env);
return ret;
@@ -111,7 +111,9 @@ IGL_INLINE bool igl::mosek::mosek_quadprog(
//}
//mosek_guarded(MSK_linkfunctoenvstream(env,MSK_STREAM_LOG,NULL,printstr));
// Create the optimization task
mosek_guarded(MSK_maketask(env,m,n,&task));
verbose("Creating task with %ld linear constraints and %ld variables...\n",m,n);
@@ -8,7 +8,9 @@
#
FIND_PATH(MOSEK_INCLUDE_DIR mosek.h
- PATHS /usr/local/mosek/7/tools/platform/osx64x86/h/
+ PATHS
+ /usr/local/mosek/7/tools/platform/osx64x86/h/
+ /usr/local/mosek/8/tools/platform/osx64x86/h/
)
SET(SEARCH_PATHS "${MOSEK_INCLUDE_DIR}" "${MOSEK_INCLUDE_DIR}/../bin" "${MOSEK_INCLUDE_DIR}/lib")