Update build for OSX and windows (#18)

* Update build configuration, goal is to make cross-compilation (used for osx-arm64 by conda-forge) actually work

* Update SConstruct to take into account different build configurations (including osx_arm64 cross-compilation) based on environment variables (PREFIX, BUILD_PREFIX, CONDA_PREFIX..)

Author: vincefn

SConstruct

@@ -48,54 +48,76 @@ env.EnsureSConsVersion(0, 98, 1)
 # Customizable compile variables
 vars = Variables('sconsvars.py')
 
-# TODO: also amend paths when VIRTUAL_ENV variable exists,
-#  if CONDA_PREFIX does not exist ?
-if 'CONDA_PREFIX' in os.environ:
+# Set PREFIX for installation and linking
+# TODO: also amend paths when VIRTUAL_ENV variable exists ?
+if 'PREFIX' in os.environ:
+    # building with a set prefix
+    vars.Add(PathVariable(
+        'prefix',
+        'installation prefix directory',
+        os.environ['PREFIX']))
+    vars.Update(env)
+elif 'CONDA_PREFIX' in os.environ:
     # building for a conda environment
     vars.Add(PathVariable(
         'prefix',
         'installation prefix directory',
         os.environ['CONDA_PREFIX']))
     vars.Update(env)
-    if platform.system().lower() == "windows":
-        vars.Add(PathVariable(
-            'libdir',
-            'installation directory for compiled library [prefix/Library/lib]',
-            pjoin(env['prefix'], 'Library', 'Lib'),
-            PathVariable.PathAccept))
-        vars.Add(PathVariable(
-            'includedir',
-            'installation directory for C++ header files [prefix/Library/include]',
-            pjoin(env['prefix'], 'Library', 'include'),
-            PathVariable.PathAccept))
-    else:
-        vars.Add(PathVariable(
-            'libdir',
-            'installation directory for compiled library [prefix/lib]',
-            pjoin(env['prefix'], 'lib'),
-            PathVariable.PathAccept))
-        vars.Add(PathVariable(
-            'includedir',
-            'installation directory for C++ header files [prefix/include]',
-            pjoin(env['prefix'], 'include'),
-            PathVariable.PathAccept))
 else:
+    # Default: install in /usr/local
     vars.Add(PathVariable(
         'prefix',
         'installation prefix directory',
         '/usr/local'))
-    vars.Update(env)
+
+if platform.system().lower() == "windows":
+    # Installation paths
+    vars.Add(PathVariable(
+        'libdir',
+        'installation directory for compiled library [prefix/Library/lib]',
+        pjoin(env['prefix'], 'Library', 'Lib'),
+        PathVariable.PathAccept))
+    vars.Add(PathVariable(
+        'includedir',
+        'installation directory for C++ header files [prefix/Library/include]',
+        pjoin(env['prefix'], 'Library', 'include'),
+        PathVariable.PathAccept))
+
+    # See https://scons.org/faq.html#Linking_on_Windows_gives_me_an_error
+    env['ENV']['TMP'] = os.environ['TMP']
+    # Prevent the generation of an import lib (.lib) in addition to the dll
+    # Unused as we are using as static library for windows
+    # env.AppendUnique(no_import_lib=1)
+
+    # Compilation and linking paths
+    env.Append(CPPPATH=[pjoin(env['prefix'], 'include')])
+    env.Append(CPPPATH=[pjoin(env['prefix'], 'Library', 'include')])
+    env.Append(LIBPATH=pjoin(env['prefix'], 'Library', 'lib'))
+else:
+    # Installation paths
     vars.Add(PathVariable(
         'libdir',
         'installation directory for compiled library [prefix/lib]',
-        env['prefix'] + '/lib',
+        pjoin(env['prefix'], 'lib'),
         PathVariable.PathAccept))
     vars.Add(PathVariable(
         'includedir',
         'installation directory for C++ header files [prefix/include]',
-        env['prefix'] + '/include',
+        pjoin(env['prefix'], 'include'),
         PathVariable.PathAccept))
 
+    # Compilation and linking paths
+    env.Append(CPPPATH=[pjoin(env['prefix'], 'include')])
+    env.Append(LIBPATH=[pjoin(env['prefix'], 'lib')])
+
+    # Specify minimum C++ standard.  Allow later standard from sconscript.local.
+    # In case of multiple `-std` options the last option holds.
+    env.PrependUnique(CXXFLAGS='-std=c++11', delete_existing=1)
+
+# for k, v in env.Dictionary().items():
+#     print(k, v)
+
 vars.Add(EnumVariable(
     'build',
     'compiler settings',
@@ -114,24 +136,6 @@ vars.Add(BoolVariable(
 vars.Update(env)
 env.Help(MY_SCONS_HELP % vars.GenerateHelpText(env))
 
-if platform.system().lower() == "windows":
-    # See https://scons.org/faq.html#Linking_on_Windows_gives_me_an_error
-    env['ENV']['TMP'] = os.environ['TMP']
-    # Prevent the generation of an import lib (.lib) in addition to the dll
-    # Unused as we are using as static library for windows
-    # env.AppendUnique(no_import_lib=1)
-    if 'CONDA_PREFIX' in os.environ:
-        env.Append(CPPPATH=[pjoin(os.environ['CONDA_PREFIX'], 'include')])
-        env.Append(CPPPATH=[pjoin(os.environ['CONDA_PREFIX'], 'Library', 'include')])
-        env.Append(LIBPATH=pjoin(os.environ['CONDA_PREFIX'], 'Library', 'lib'))
-else:
-    if 'CONDA_PREFIX' in os.environ:
-        env.Append(CPPPATH=pjoin(os.environ['CONDA_PREFIX'], 'include'))
-        env.Append(LIBPATH=pjoin(os.environ['CONDA_PREFIX'], 'lib'))
-    # Specify minimum C++ standard.  Allow later standard from sconscript.local.
-    # In case of multiple `-std` options the last option holds.
-    env.PrependUnique(CXXFLAGS='-std=c++11', delete_existing=1)
-
 # the CPPPATH directories are checked by scons dependency scanner
 cpppath = getsyspaths('CPLUS_INCLUDE_PATH', 'CPATH')
 env.AppendUnique(CPPPATH=cpppath)

conda-recipe/conda_build_config.yaml

@@ -1,5 +1,5 @@
 boost:
-  - 1.73
+  - 1.78
 
 # only for local build ? see https://github.com/conda/conda-build/issues/4064#issuecomment-702983257
 #CONDA_BUILD_SYSROOT:

conda-recipe/sconscript.local

@@ -5,14 +5,18 @@ Import('env')
 import os
 import platform
 
-if platform.system() != 'Darwin':
-    # Apply environment settings for Anaconda compilers
-    env.Replace(CXX=os.environ['CXX'])
-    env.MergeFlags(os.environ['CFLAGS'])
-    env.MergeFlags(os.environ['CPPFLAGS'])
-    env.MergeFlags(os.environ['CXXFLAGS'])
-    env.MergeFlags(os.environ['LDFLAGS'])
+if platform.system().lower() == 'darwin' and 'CONDA_BUILD_SYSROOT' in os.environ:
+    env.AppendUnique(CPPFLAGS=['-isysroot', os.environ['CONDA_BUILD_SYSROOT']])
+    env.AppendUnique(LINKFLAGS=['-isysroot', os.environ['CONDA_BUILD_SYSROOT']])
+
+# Apply environment settings for Anaconda compilers
+env.Replace(CXX=os.environ['CXX'])
+env.MergeFlags(os.environ['CFLAGS'])
+env.MergeFlags(os.environ['CPPFLAGS'])
+env.MergeFlags(os.environ['CXXFLAGS'])
+env.MergeFlags(os.environ['LDFLAGS'])
 
+if platform.system() != 'Darwin':
     # Use the default c++98 language standard
     cxxflags98 = [f for f in env['CXXFLAGS'] if not f.startswith('-std=')]
     env.Replace(CXXFLAGS=cxxflags98)

site_scons/fallback_version.py

@@ -7,4 +7,4 @@
 Update FALLBACK_VERSION when tagging a new release.
 '''
 
-FALLBACK_VERSION = '2022.1.post0'
+FALLBACK_VERSION = '2022.1.1.post0'