polish
This commit is contained in:
11
Makefile
11
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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -32,8 +32,6 @@ DOTNET_ORTOOLS_ASSEMBLY_NAME := Google.OrTools
|
||||
|
||||
dotnet: $(OR_TOOLS_LIBS)
|
||||
|
||||
BUILT_LANGUAGES += , .Net (6.0)
|
||||
|
||||
###################
|
||||
## .NET SOURCE ##
|
||||
###################
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -22,8 +22,6 @@ PYTHON_EXECUTABLE := dependencies$Spython$Svenv$Sbin$Spython
|
||||
|
||||
python: $(OR_TOOLS_LIBS)
|
||||
|
||||
BUILT_LANGUAGES += , Python$(PYTHON_VERSION)
|
||||
|
||||
#######################
|
||||
## Python SOURCE ##
|
||||
#######################
|
||||
|
||||
Reference in New Issue
Block a user