Added indent_style to editorconfig, fixed inconsistent use of tabs and spaces in indentation.
This commit is contained in:
parent
f3ad14224e
commit
edb1df15ea
3 changed files with 11 additions and 7 deletions
|
@ -8,6 +8,10 @@ indent_style = tab
|
|||
[*.{cpp,hpp,c,h,mm}]
|
||||
trim_trailing_whitespace = true
|
||||
|
||||
[*.py]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
|
||||
[.travis.yml]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
|
|
@ -188,8 +188,8 @@ def configure(env):
|
|||
else:
|
||||
VC_PATH = ""
|
||||
|
||||
if (env["openmp"]):
|
||||
env.Append(CPPFLAGS=['/openmp'])
|
||||
if (env["openmp"]):
|
||||
env.Append(CPPFLAGS=['/openmp'])
|
||||
|
||||
env.Append(CCFLAGS=["/I" + p for p in os.getenv("INCLUDE").split(";")])
|
||||
env.Append(LIBPATH=[p for p in os.getenv("LIB").split(";")])
|
||||
|
@ -267,9 +267,9 @@ def configure(env):
|
|||
env.Append(CCFLAGS=['-flto'])
|
||||
env.Append(LINKFLAGS=['-flto=' + str(env.GetOption("num_jobs"))])
|
||||
|
||||
if (env["openmp"]):
|
||||
env.Append(CPPFLAGS=['-fopenmp'])
|
||||
env.Append(LIBS=['gomp'])
|
||||
if (env["openmp"]):
|
||||
env.Append(CPPFLAGS=['-fopenmp'])
|
||||
env.Append(LIBS=['gomp'])
|
||||
|
||||
## Compile flags
|
||||
|
||||
|
|
|
@ -266,8 +266,8 @@ def configure(env):
|
|||
|
||||
|
||||
if (env["openmp"]):
|
||||
env.Append(CPPFLAGS=['-fopenmp'])
|
||||
env.Append(LIBS=['gomp'])
|
||||
env.Append(CPPFLAGS=['-fopenmp'])
|
||||
env.Append(LIBS=['gomp'])
|
||||
|
||||
if env['use_static_cpp']:
|
||||
env.Append(LINKFLAGS=['-static-libstdc++'])
|
||||
|
|
Loading…
Reference in a new issue