update bootstrap.py for the last time...!

then, its on to do harness testing with CMake
This commit is contained in:
ThePhD 2017-12-11 13:23:32 -05:00
parent e54b775003
commit 2f3d5e6e11
2 changed files with 9 additions and 2 deletions

View File

@ -26,7 +26,7 @@ option(TESTS "Enable build of tests" ON)
option(EXAMPLES "Enable build of examples" ON) option(EXAMPLES "Enable build of examples" ON)
if (TESTS) if (TESTS)
enable_testing() enable_testing()
endif() endif()
include_directories(${LUA_INCLUDE_DIR}) include_directories(${LUA_INCLUDE_DIR})

View File

@ -4,6 +4,7 @@ import ninja_syntax
import os, sys, glob, re import os, sys, glob, re
import itertools import itertools
import argparse import argparse
import urllib.request
# utilities # utilities
def flags(*args): def flags(*args):
@ -53,9 +54,15 @@ system is {}""".format(install_dir)
args = parser.parse_args() args = parser.parse_args()
# prepare paths and files
catch_file = os.path.join('external', 'Catch', 'include', 'catch.hpp')
os.makedirs(os.path.dirname(catch_file), exist_ok=True)
urllib.request.urlretrieve("https://github.com/catchorg/Catch2/releases/download/v2.0.1/catch.hpp", catch_file)
# general variables # general variables
include = [ '.', './include' ] include = [ '.', './include' ]
depends = [os.path.join('Catch', 'include')] depends = [os.path.join('external', 'Catch', 'include')]
cxxflags = [ '-Wno-unknown-warning', '-Wno-unknown-warning-option', '-Wall', '-Wextra', '-Wpedantic', '-pedantic', '-pedantic-errors', '-Wno-noexcept-type', '-std=c++14', '-ftemplate-depth=1024' ] cxxflags = [ '-Wno-unknown-warning', '-Wno-unknown-warning-option', '-Wall', '-Wextra', '-Wpedantic', '-pedantic', '-pedantic-errors', '-Wno-noexcept-type', '-std=c++14', '-ftemplate-depth=1024' ]
cxxflags.extend([p for p in re.split("( |\\\".*?\\\"|'.*?')", args.cxx_flags) if p.strip()]) cxxflags.extend([p for p in re.split("( |\\\".*?\\\"|'.*?')", args.cxx_flags) if p.strip()])
example_cxxflags = [ '-Wno-unknown-warning', '-Wno-unknown-warning-option', '-Wall', '-Wextra', '-Wpedantic', '-pedantic', '-pedantic-errors', '-Wno-noexcept-type', '-std=c++14', '-ftemplate-depth=1024' ] example_cxxflags = [ '-Wno-unknown-warning', '-Wno-unknown-warning-option', '-Wall', '-Wextra', '-Wpedantic', '-pedantic', '-pedantic-errors', '-Wno-noexcept-type', '-std=c++14', '-ftemplate-depth=1024' ]