openmp fix 4

samayala22 · Feb 2, 2024 · 103a9ed · 103a9ed
1 parent b9ac426
commit 103a9ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/vlm/backends/avx2/xmake.lua b/vlm/backends/avx2/xmake.lua
@@ -4,7 +4,8 @@ target("backend-avx2")
     set_kind("static")
     set_default(false)
     add_vectorexts("avx2", "fma")
-    add_packages("tbb", "openmp", "eigen")
+    add_packages("openmp", {public = true})
+    add_packages("tbb", "eigen")
 
     add_includedirs("../../include")
     add_files("src/*.cpp")

diff --git a/vlm/xmake.lua b/vlm/xmake.lua
@@ -1,4 +1,4 @@
-add_requires("openmp")
+-- add_requires("openmp")
 
 target("libvlm")
     set_kind("static")
@@ -16,7 +16,7 @@ target("vlm")
     set_kind("binary")
     set_default(true)
     add_rpathdirs("$ORIGIN") -- tbb dll must be in same dir as exe
-    add_packages("openmp") -- needed for gcc linker (for eigen)
+    -- add_packages("openmp") -- needed for gcc linker (for eigen)
     add_deps("libvlm") -- core library
     set_runargs({"-i"}, {"../../../../config/elliptic.vlm"}, {"-m"}, {"../../../../mesh/elliptic_64x64.x"}, {"-o"}, {"../../../../results/elliptic.vtu"})
     add_files("dev/main.cpp")

diff --git a/xmake.lua b/xmake.lua
@@ -45,7 +45,7 @@ for _,name in ipairs(backends) do
     end
 end
 
-add_requires("openmp")
+-- add_requires("openmp")
 
 includes("vlm/xmake.lua") -- library and main driver
 
@@ -55,7 +55,7 @@ for _, file in ipairs(os.files("tests/test_*.cpp")) do
     target(name)
         set_kind("binary")
         set_default(false)
-        add_packages("openmp") -- needed for gcc linker (for eigen)
+        -- add_packages("openmp") -- needed for gcc linker (for eigen)
         add_deps("libvlm")
         add_files("tests/" .. name .. ".cpp")
         add_tests("default")