diff --git a/ortools/linear_solver/BUILD.bazel b/ortools/linear_solver/BUILD.bazel index c0774941c2..9bf36205b6 100644 --- a/ortools/linear_solver/BUILD.bazel +++ b/ortools/linear_solver/BUILD.bazel @@ -131,18 +131,6 @@ config_setting( }, ) -bool_flag( - name = "with_xpress", - build_setting_default = False, -) - -config_setting( - name = "use_xpress", - flag_values = { - ":with_xpress": "true", - }, -) - proto_library( name = "linear_solver_proto", srcs = ["linear_solver.proto"], @@ -175,6 +163,7 @@ cc_library( "linear_solver_callback.cc", "lpi_glop.cpp", "sat_interface.cc", + "xpress_interface.cc", ] + select({ ":use_bop": ["bop_interface.cc"], "//conditions:default": [], @@ -208,9 +197,6 @@ cc_library( }) + select({ ":use_cplex": ["cplex_interface.cc"], "//conditions:default": [], - }) + select({ - ":use_xpress": ["xpress_interface.cc"], - "//conditions:default": [], }), hdrs = [ "linear_expr.h", @@ -264,6 +250,7 @@ cc_library( "//ortools/base:stl_util", "//ortools/base:timer", "//ortools/gurobi:environment", + "//ortools/xpress:environment", "//ortools/linear_solver/proto_solver", "//ortools/port:file", "//ortools/port:proto_utils",