This commit is contained in:
Laurent Perron
2022-02-22 11:03:26 +01:00
parent ff670072ed
commit 840897cda7
2 changed files with 6 additions and 9 deletions

View File

@@ -121,24 +121,22 @@ help_all: help_usage help_third_party help_cc help_python help_java help_dotnet
.PHONY: build_all
build_all: cc python java dotnet
@echo Or-tools has been built for $(BUILT_LANGUAGES)
@echo Or-tools has been built for "$(BUILT_LANGUAGES)"
.PHONY: check_all
check_all: check_cc check_python check_java check_dotnet
@echo Or-tools has been built and checked for $(BUILT_LANGUAGES)
@echo Or-tools has been built and checked for "$(BUILT_LANGUAGES)"
.PHONY: test_all
test_all: test_cc test_python test_java test_dotnet
@echo Or-tools have been built and tested for $(BUILT_LANGUAGES)
@echo Or-tools have been built and tested for "$(BUILT_LANGUAGES)"
.PHONY: clean_all
clean_all: #clean_cc clean_python clean_java clean_dotnet clean_archive clean_third_party
clean_all: clean_cc clean_python clean_java clean_dotnet clean_archive clean_third_party
-$(DELREC) $(BIN_DIR)
-$(DELREC) $(LIB_DIR)
-$(DELREC) $(OBJ_DIR)
@echo NNN $(BUILT_LANGUAGES)
@echo Or-Tools has been cleaned for $(BUILT_LANGUAGES)
@echo AAA
@echo Or-Tools has been cleaned for "$(BUILT_LANGUAGES)"
.PHONY: detect_all
detect_all: detect_port detect_third_party detect_cc detect_python detect_java detect_dotnet detect_archive

View File

@@ -37,7 +37,7 @@ dependencies/ortools.sln: | dependencies
-DUSE_GLPK=$(USE_GLPK) \
-DCMAKE_INSTALL_PREFIX=$(OR_ROOT_FULL)
.PHONY: clean_third_party # Clean everything. Remember to also delete archived dependencies, i.e. in the event of download failure, etc.
.PHONY: clean_third_party
clean_third_party:
-$(DEL) Makefile.local
-$(DELREC) dependencies\\*
@@ -50,7 +50,6 @@ clean_third_party:
.PHONY: detect_third_party # Show variables used to find third party
detect_third_party:
@echo Relevant info on third party:
@echo WINDOWS_SCIP_DIR = $(WINDOWS_SCIP_DIR)
@echo USE_COINOR = $(USE_COINOR)
@echo USE_SCIP = $(USE_SCIP)
ifdef WINDOWS_GLPK_DIR