Skip to content

Commit

Permalink
Edit Makefile fo CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Braktar committed May 18, 2022
1 parent d5d09e8 commit a9618e1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ CFLAGS := $(CFLAGS) -Wall -Wextra -Wshadow -Wmissing-include-dirs -Wswitch-enum
# The following is to supress a warning due to a protobuf that is fixed at v3.14.
# It can be removed when or-tools is upgraded to v8.1+ (where the protobuf dependency is upgraded to v3.14).
PROTOBUF_VERSION := $(shell $(OR_TOOLS_TOP)/bin/protoc --version | cut -d" " -f2)
ifeq ($(shell dpkg --compare-versions $(PROTOBUF_VERSION) 'lt' '3.14' && echo true), true)
ifeq ($(shell dpkg --compare-versions $(PROTOBUF_VERSION) 'lt' '3.19' && echo true), true)
CFLAGS := $(CFLAGS) -Wno-array-bounds
endif

Expand Down Expand Up @@ -48,7 +48,7 @@ tsp_simple.o: tsp_simple.cc ortools_vrp.pb.h \

tsp_simple: $(ROUTING_DEPS) tsp_simple.o ortools_vrp.pb.o ortools_result.pb.o $(OR_TOOLS_TOP)/lib/libortools.so
$(CXX) $(CFLAGS) -g tsp_simple.o ortools_vrp.pb.o ortools_result.pb.o $(OR_TOOLS_LD_FLAGS) \
-L $(OR_TOOLS_TOP)/lib -Wl,-rpath $(OR_TOOLS_TOP)/lib -lortools -lprotobuf \
-L $(OR_TOOLS_TOP)/lib -Wl,-rpath $(OR_TOOLS_TOP)/lib -lortools -L $(OR_TOOLS_TOP)/include/google -lprotobuf \
-o tsp_simple

local_clean:
Expand Down

0 comments on commit a9618e1

Please sign in to comment.