equal
deleted
inserted
replaced
33 xy_test \ |
33 xy_test \ |
34 heap_test |
34 heap_test |
35 |
35 |
36 if HAVE_GLPK |
36 if HAVE_GLPK |
37 check_PROGRAMS += lp_test |
37 check_PROGRAMS += lp_test |
38 endif |
38 else !HAVE_GLPK |
|
39 if HAVE_CPLEX |
|
40 check_PROGRAMS += lp_test |
|
41 endif HAVE_CPLEX |
|
42 endif !HAVE_GLPK |
39 |
43 |
40 TESTS = $(check_PROGRAMS) |
44 TESTS = $(check_PROGRAMS) |
41 XFAIL_TESTS = test_tools_fail$(EXEEXT) |
45 XFAIL_TESTS = test_tools_fail$(EXEEXT) |
42 |
46 |
43 bfs_test_SOURCES = bfs_test.cc |
47 bfs_test_SOURCES = bfs_test.cc |
60 xy_test_SOURCES = xy_test.cc |
64 xy_test_SOURCES = xy_test.cc |
61 undir_graph_test_SOURCES = undir_graph_test.cc |
65 undir_graph_test_SOURCES = undir_graph_test.cc |
62 heap_test_SOURCES = heap_test.cc |
66 heap_test_SOURCES = heap_test.cc |
63 |
67 |
64 lp_test_SOURCES = lp_test.cc |
68 lp_test_SOURCES = lp_test.cc |
65 lp_test_CXXFLAGS = $(GLPK_CFLAGS) |
69 lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) |
66 lp_test_LDFLAGS = $(GLPK_LIBS) |
|