Add fmmlib to setup.py

Author: rpep

setup.py

@@ -8,13 +8,12 @@
 import re
 import sys
 
-#if sys.platform == 'darwin':
+# if sys.platform == 'darwin':
 #    from distutils import sysconfig
 #    vars = sysconfig.get_config_vars()
 #    vars['LDSHARED'] = vars['LDSHARED'].replace('-bundle', '-dynamiclib')
 
 
-
 if 'CC' in os.environ:
     print("Using CC={}".format(os.environ['CC']))
 else:
@@ -32,7 +31,7 @@
 MICRO_DIR = os.path.join(SRC_DIR, "micro", "lib")
 BARYAKHTAR_DIR = os.path.join(MICRO_DIR, "baryakhtar")
 DEMAG_DIR = os.path.join(SRC_DIR, "common", "dipolar")
-FMM_DIR = os.path.join(SRC_DIR, "atomistic", "lib", "demag_multipoles")
+FMM_DIR = os.path.join(SRC_DIR, "atomistic", "lib", "fmmlib")
 LOCAL_DIR = os.path.join(MODULE_DIR, "local")
 INCLUDE_DIR = os.path.join(LOCAL_DIR, "include")
 LIB_DIR = os.path.join(LOCAL_DIR, "lib")
@@ -51,6 +50,7 @@ def get_version():
                 return m.group(2)
     raise Exception("Couldn't find __version__ in %s" % pkg_init_path)
 
+
 version = get_version()
 
 
@@ -62,6 +62,7 @@ def glob_cfiles(path, excludes, extension="*.c"):
             cfiles.append(cfile)
     return cfiles
 
+
 sources = []
 sources.append(os.path.join(ATOM_DIR, 'clib.pyx'))
 sources += glob_cfiles(ATOM_DIR, excludes=["clib.c"])
@@ -119,11 +120,12 @@ def glob_cfiles(path, excludes, extension="*.c"):
 fmm_sources.append(os.path.join(FMM_DIR, 'fmmlib.pyx'))
 fmm_sources += glob_cfiles(FMM_DIR, excludes=[], extension="*.cpp")
 
+print(fmm_sources)
 
 com_libs = ['m', 'fftw3_omp', 'fftw3', 'sundials_cvodes',
             'sundials_nvecserial', 'sundials_nvecopenmp', 'blas', 'lapack']
 
-com_args = ['-std=c99', '-O3']
+com_args = ['-O3']
 # rpath is the path relative to the compiled shared object files (e.g. clib.so, etc)
 # which the dynamic linker looks for the linked libraries (e.g. libsundials_*.so) in.
 # We need to set it relatively in order for it to be preserved if the parent directory is moved
@@ -153,7 +155,9 @@ def glob_cfiles(path, excludes, extension="*.c"):
     com_inc.append(os.environ['FFTW_INC'])
 
 com_args_cpp = com_args.copy()
-com_args_cpp.append('std=c++14')
+com_args_cpp.append('-std=c++14')
+
+com_args.append('-std=c99')
 com_inc_cpp = com_inc.copy()
 com_link_cpp = com_link.copy()
 com_libs_cpp = com_libs.copy()
@@ -164,15 +168,15 @@ def glob_cfiles(path, excludes, extension="*.c"):
               sources=sources,
               include_dirs=com_inc,
               libraries=com_libs,
-	          library_dirs=lib_paths, runtime_library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
     Extension("fidimag.extensions.common_clib",
               sources=common_sources,
               include_dirs=com_inc,
               libraries=com_libs,
-	          library_dirs=lib_paths, runtime_library_dirs=lib_paths,
+              library_dirs=lib_paths, runtime_library_dirs=lib_paths,
               extra_compile_args=com_args,
               extra_link_args=com_link,
               ),
@@ -271,6 +275,7 @@ def glob_cfiles(path, excludes, extension="*.c"):
               library_dirs=lib_paths_cpp, runtime_library_dirs=lib_paths_cpp,
               extra_compile_args=com_args_cpp,
               extra_link_args=com_link_cpp,
+              language="c++",
               )
 ]