From 5f72da9c93dfa7ba7cdb19acf71c7ba385910c21 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 22 Dec 2015 11:21:28 +0100 Subject: [PATCH] prepare.py: add force option hint --- prepare.py | 4 ++-- submodules/cmake-builder | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prepare.py b/prepare.py index 74361cc85..c356ed368 100755 --- a/prepare.py +++ b/prepare.py @@ -535,9 +535,9 @@ def main(argv=None): if x not in selected_platforms: selected_platforms.append(x) - if os.path.isdir('WORK') and not args.clean: + if os.path.isdir('WORK') and not args.clean and not args.force: warning("Working directory WORK already exists. Please remove it (option -C or -c) before re-executing CMake " - "to avoid conflicts between executions.") + "to avoid conflicts between executions, or force execution (option -f) if you are aware of consequences.") if os.path.isfile('Makefile'): Popen("make help-prepare-options".split(" ")) return 0 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index f45364d8a..b458a004e 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit f45364d8a610f6cc36aba5a37ad15d9d42c41e31 +Subproject commit b458a004e736f17e059741f067bc754adee3cb88