Commit 346e23e4 authored by Martin Marinov's avatar Martin Marinov
Browse files

Removed Gurobi and Cbc dependencies.

[git-p4: depot-paths = "//ReForm/ReForm/main/CoMISo/": change = 12180]
parent 704559ee
......@@ -11,10 +11,10 @@ my_add_subdir(Utils)
include_directories(${PROJECT_SOURCE_DIR}/..)
include_directories(${3P_DIR}/Eigen/${INC_DIR})
include_directories(${3P_DIR}/Gmm/${INC_DIR})
# include_directories(${3P_DIR}/CPLEX/${INC_DIR}) # CPLEX is no longer used
include_directories(${3P_DIR}/Gurobi/${INC_DIR})
# include_directories(${3P_DIR}/CPLEX/${INC_DIR}) # no longer used
# include_directories(${3P_DIR}/Gurobi/${INC_DIR}) # no longer used
include_directories(${3P_DIR}/IPOPT/${INC_DIR})
include_directories(${3P_DIR}/Cbc/${INC_DIR})
# include_directories(${3P_DIR}/Cbc/${INC_DIR}) # no longer used
include_directories(${3P_DIR}/libcurl/${INC_DIR})
include_directories(${3P_DIR}/Boost/${INC_DIR})
......
......@@ -16,8 +16,8 @@
#define COMISO_METIS_AVAILABLE 1
#define COMISO_CGAL_AVAILABLE 1
#define COMISO_TAUCS_AVAILABLE 0
#define COMISO_CBC_AVAILABLE 1
#define COMISO_GUROBI_AVAILABLE 1
#define COMISO_CBC_AVAILABLE 0
#define COMISO_GUROBI_AVAILABLE 0
#define COMISO_CPLEX_AVAILABLE 0
#define COMISO_DOCLOUD_AVAILABLE 1
#define COMISO_ARPACK_AVAILABLE 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment