@@ -111,10 +111,6 @@ vars.Add(BoolVariable(
111
111
'with_shared_cctbx' ,
112
112
'compile and link with the shared cctbx library' , False ))
113
113
114
- # Specify minimum C++ standard. Allow later standard from sconscript.local.
115
- # In case of multiple `-std` options the last option holds.
116
- env .PrependUnique (CXXFLAGS = '-std=c++11' , delete_existing = 1 )
117
-
118
114
vars .Update (env )
119
115
env .Help (MY_SCONS_HELP % vars .GenerateHelpText (env ))
120
116
@@ -125,13 +121,16 @@ if platform.system().lower() == "windows":
125
121
# Unused as we are using as static library for windows
126
122
# env.AppendUnique(no_import_lib=1)
127
123
if 'CONDA_PREFIX' in os .environ :
128
- env .Append (CPPPATH = pjoin (os .environ ['CONDA_PREFIX' ], 'include' ))
129
- env .Append (CPPPATH = pjoin (os .environ ['CONDA_PREFIX' ], 'Library' , 'include' ))
124
+ env .Append (CPPPATH = [ pjoin (os .environ ['CONDA_PREFIX' ], 'include' )] )
125
+ env .Append (CPPPATH = [ pjoin (os .environ ['CONDA_PREFIX' ], 'Library' , 'include' )] )
130
126
env .Append (LIBPATH = pjoin (os .environ ['CONDA_PREFIX' ], 'Library' , 'lib' ))
131
127
else :
132
128
if 'CONDA_PREFIX' in os .environ :
133
129
env .Append (CPPPATH = pjoin (os .environ ['CONDA_PREFIX' ], 'include' ))
134
130
env .Append (LIBPATH = pjoin (os .environ ['CONDA_PREFIX' ], 'lib' ))
131
+ # Specify minimum C++ standard. Allow later standard from sconscript.local.
132
+ # In case of multiple `-std` options the last option holds.
133
+ env .PrependUnique (CXXFLAGS = '-std=c++11' , delete_existing = 1 )
135
134
136
135
# the CPPPATH directories are checked by scons dependency scanner
137
136
cpppath = getsyspaths ('CPLUS_INCLUDE_PATH' , 'CPATH' )
0 commit comments