From c59f4e8a84a118651457a21ce26acf3e5a08d981 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 4 Jun 2018 17:22:28 +0200 Subject: [PATCH] Add missing util/*.pb.h to install rules --- makefiles/Makefile.archive.mk | 2 +- makefiles/Makefile.cpp.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/makefiles/Makefile.archive.mk b/makefiles/Makefile.archive.mk index 44df60c639..057514a3f0 100644 --- a/makefiles/Makefile.archive.mk +++ b/makefiles/Makefile.archive.mk @@ -105,7 +105,7 @@ cc_archive: cc $(COPY) ortools$Ssat$S*.h temp$S$(INSTALL_DIR)$Sinclude$Sortools$Ssat $(COPY) ortools$Sgen$Sortools$Ssat$S*.pb.h temp$S$(INSTALL_DIR)$Sinclude$Sortools$Ssat $(COPY) ortools$Sutil$S*.h temp$S$(INSTALL_DIR)$Sinclude$Sortools$Sutil - + $(COPY) ortools$Sgen$Sortools$Sutil$S*.pb.h temp$S$(INSTALL_DIR)$Sinclude$Sortools$Sutil ifeq ($(SYSTEM),win) $(COPY) tools$Smake.exe temp$S$(INSTALL_DIR) cd temp$S$(INSTALL_DIR)$Sinclude && ..$S..$S..$Stools$Star.exe -C ..$S..$S..$Sdependencies$Sinstall$Sinclude -c -v gflags | ..$S..$S..$Stools$Star.exe xvm diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk index bfed46e109..0aaa6d67be 100755 --- a/makefiles/Makefile.cpp.mk +++ b/makefiles/Makefile.cpp.mk @@ -878,6 +878,7 @@ install_libortools: ortoolslibs install_dirs $(COPY) ortools$Ssat$S*.h "$(DESTDIR)$(prefix)$Sinclude$Sortools$Ssat" $(COPY) $(GEN_DIR)$Sortools$Ssat$S*.pb.h "$(DESTDIR)$(prefix)$Sinclude$Sortools$Ssat" $(COPY) ortools$Sutil$S*.h "$(DESTDIR)$(prefix)$Sinclude$Sortools$Sutil" + $(COPY) $(GEN_DIR)$Sortools$Sutil$S*.pb.h "$(DESTDIR)$(prefix)$Sinclude$Sortools$Sutil" $(COPY) $(LIB_DIR)$S$(LIB_PREFIX)ortools.$L "$(DESTDIR)$(prefix)$Slib" install_third_party: install_dirs