diff --git a/binding.gyp b/binding.gyp index ff2cf8c..38bf17d 100644 --- a/binding.gyp +++ b/binding.gyp @@ -33,6 +33,9 @@ { "juliaInclude":"/usr/include/julia" }, { "juliaInclude":"<(juliaBase)/include/julia" } ], + [ "OS=='mac'", + { "juliaInclude":"<(juliaBase)/include/julia" } + ], [ "OS == 'linux'", { "gcc_target":"> &args,int64_t exprId) if(!jl_args[i]) rvalue_error = true; } if(!rvalue_error) jl_res = jl_call(func,jl_args,(int)numArgs); - delete jl_args; + delete[] jl_args; } if(rvalue_error) diff --git a/tools/find_julia.py b/tools/find_julia.py index 78d726c..728cbdc 100755 --- a/tools/find_julia.py +++ b/tools/find_julia.py @@ -1,6 +1,7 @@ import os import sys import subprocess +import glob def julia_from_which_julia(): @@ -41,8 +42,10 @@ def julia_from_home_directory_win(): return ""; def julia_from_applications(): - julia_dir = "/Applications/Julia-0.3.0.app/Contents/Resources/julia/" - if os.path.isdir(julia_dir): return julia_dir + julia_dirs = glob.glob("/Applications/Julia-*.app/Contents/Resources/julia/") + if(julia_dirs is not None and len(julia_dirs) > 0): + julia_dirs.sort(reverse=True) # use latest if multiple homes exist + return julia_dirs[0] return "" if sys.argv[1] == "win": diff --git a/tools/nj_config.py b/tools/nj_config.py index d90a21c..3ab84e3 100644 --- a/tools/nj_config.py +++ b/tools/nj_config.py @@ -3,6 +3,7 @@ import sys import subprocess import platform +import glob def which(cmd): @@ -51,8 +52,10 @@ def julia_base_from_home_directory_win(): return path def julia_base_from_applications(): - julia_dir = "/Applications/Julia-0.3.0.app/Contents/Resources/julia/" - if os.path.isdir(julia_dir): return julia_dir + julia_dirs = glob.glob("/Applications/Julia-*.app/Contents/Resources/julia/") + if(julia_dirs is not None and len(julia_dirs) > 0): + julia_dirs.sort(reverse=True) # use latest if multiple homes exist + return julia_dirs[0] return "" def find_julia_base(operating_system):