Browse Source

julia: Generate StarPU headers translation in build directory.

Pierre Huchant 5 years ago
parent
commit
dd0d76f569
2 changed files with 6 additions and 6 deletions
  1. 2 2
      julia/src/StarPU.jl
  2. 4 4
      julia/src/translate_headers.jl

+ 2 - 2
julia/src/StarPU.jl

@@ -31,8 +31,8 @@ if !isfile((@__DIR__)*"/../gen/libstarpu_common.jl") || !isfile((@__DIR__)*"/../
     starpu_translate_headers()
 end
 
-include("../gen/libstarpu_common.jl")
-include("../gen/libstarpu_api.jl")
+include(joinpath(fstarpu_build_dir(), "julia/gen/libstarpu_common.jl"))
+include(joinpath(fstarpu_build_dir(), "julia/gen/libstarpu_api.jl"))
 include("globals.jl")
 
 include("compiler/include.jl")

+ 4 - 4
julia/src/translate_headers.jl

@@ -19,8 +19,8 @@ using Clang.LibClang.LLVM_jll
 function starpu_translate_headers()
     debug_print("Translating StarPU headers...")
 
-    if !isdir((@__DIR__)*"/../gen")
-        mkdir((@__DIR__)*"/../gen")
+    if !isdir(joinpath(fstarpu_build_dir(), "julia/gen"))
+        mkdir(joinpath(fstarpu_build_dir(), "julia/gen"))
     end
 
     STARPU_BUILD_INCLUDE=joinpath(fstarpu_build_dir(), "include")
@@ -94,8 +94,8 @@ function starpu_translate_headers()
                                "STARPU_USE_CUDA"])
 
     wc = init(; headers = STARPU_HEADERS,
-              output_file = joinpath(@__DIR__, "../gen/libstarpu_api.jl"),
-              common_file = joinpath(@__DIR__, "../gen/libstarpu_common.jl"),
+              output_file = joinpath(fstarpu_build_dir(), "julia/gen/libstarpu_api.jl"),
+              common_file = joinpath(fstarpu_build_dir(), "julia/gen/libstarpu_common.jl"),
               clang_includes = vcat(LIBCLANG_INCLUDE, CLANG_INCLUDE),
               clang_args = clang_args,
               header_library = x->"starpu_wrapper_library_name",