From 464a7bbdfc5f18333085fcbc958e94f4048f166a Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Tue, 22 Feb 2022 10:46:37 +0100 Subject: [PATCH] polish --- Makefile | 11 +++++++++++ makefiles/Makefile.cpp.mk | 2 -- makefiles/Makefile.dotnet.mk | 2 -- makefiles/Makefile.java.mk | 1 - makefiles/Makefile.python.mk | 2 -- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e0878751a1..aa0f170f91 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,17 @@ endif endif # Include .mk files. +BUILT_LANGUAGES = C++ +ifeq ($(BUILD_PYTHON),ON) +BUILT_LANGUAGES +=, Python$(PYTHON_VERSION) +endif +ifeq ($(BUILD_JAVA),ON) +BUILT_LANGUAGES +=, Java +endif +ifeq ($(BUILD_DOTNET),ON) +BUILT_LANGUAGES +=, .Net (6.0) +endif + include $(OR_ROOT)makefiles/Makefile.cpp.mk include $(OR_ROOT)makefiles/Makefile.python.mk include $(OR_ROOT)makefiles/Makefile.java.mk diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk index 7be00c8e78..e4fe5dfed4 100644 --- a/makefiles/Makefile.cpp.mk +++ b/makefiles/Makefile.cpp.mk @@ -29,8 +29,6 @@ OR_TOOLS_LIBS = $(LIB_DIR)/$(LIB_PREFIX)ortools.$L.$(OR_TOOLS_MAJOR) endif endif -BUILT_LANGUAGES = C++ - # Main target .PHONY: cc # Build C++ OR-Tools library. .PHONY: test_cc # Run all C++ OR-Tools test targets. diff --git a/makefiles/Makefile.dotnet.mk b/makefiles/Makefile.dotnet.mk index 0204f192ef..d775a40d5b 100644 --- a/makefiles/Makefile.dotnet.mk +++ b/makefiles/Makefile.dotnet.mk @@ -32,8 +32,6 @@ DOTNET_ORTOOLS_ASSEMBLY_NAME := Google.OrTools dotnet: $(OR_TOOLS_LIBS) -BUILT_LANGUAGES += , .Net (6.0) - ################### ## .NET SOURCE ## ################### diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk index e07c4e4ddc..08c809faf9 100644 --- a/makefiles/Makefile.java.mk +++ b/makefiles/Makefile.java.mk @@ -35,7 +35,6 @@ JAVA_ORTOOLS_PACKAGE := com.google.ortools .PHONY: java # Build Java OR-Tools. .PHONY: test_java # Test Java OR-Tools using various examples. java: $(OR_TOOLS_LIBS) -BUILT_LANGUAGES +=, Java # Detect RuntimeIDentifier ifeq ($(OS),Windows) diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk index 5d64a803a7..abacec18ff 100644 --- a/makefiles/Makefile.python.mk +++ b/makefiles/Makefile.python.mk @@ -22,8 +22,6 @@ PYTHON_EXECUTABLE := dependencies$Spython$Svenv$Sbin$Spython python: $(OR_TOOLS_LIBS) -BUILT_LANGUAGES += , Python$(PYTHON_VERSION) - ####################### ## Python SOURCE ## #######################