AnotherFoxGuy/autocmake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #208 from bast/master

Browse Source 
do not stop configuration on a cmake warning; fixes #174
This commit is contained in:
Radovan Bast 2017-08-11 18:07:16 +02:00 committed by GitHub
commit 37d02eebcd
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
autocmake/configure.py
View File

@ -98,8 +98,10 @@ def run_cmake(command, build_path, default_build_path):
print(stdout) print(stdout)
if stderr: if stderr:
# we write out stderr but we do not stop yet
# this is because CMake warnings are sent to stderr
# and they might be benign
sys.stderr.write(stderr) sys.stderr.write(stderr)
sys.exit(1)
# write cmake output to file # write cmake output to file
with open('cmake_output', 'w') as f: with open('cmake_output', 'w') as f:
@ -108,16 +110,21 @@ def run_cmake(command, build_path, default_build_path):
# change directory and return # change directory and return
os.chdir(topdir) os.chdir(topdir)
if 'Configuring incomplete' in stdout: # to figure out whether configuration was a success
# configuration was not successful # we check for 3 sentences that should be part of stdout
configuring_done = '-- Configuring done' in stdout
generating_done = '-- Generating done' in stdout
build_files_written = '-- Build files have been written to' in stdout
configuration_successful = configuring_done and generating_done and build_files_written
if configuration_successful:
save_setup_command(sys.argv, build_path)
print_build_help(build_path, default_build_path)
else:
if (build_path == default_build_path): if (build_path == default_build_path):
# remove build_path iff not set by the user # remove build_path iff not set by the user
# otherwise removal can be dangerous # otherwise removal can be dangerous
rmtree(default_build_path) rmtree(default_build_path)
else:
# configuration was successful
save_setup_command(sys.argv, build_path)
print_build_help(build_path, default_build_path)
def print_build_help(build_path, default_build_path): def print_build_help(build_path, default_build_path):