introduce -d:localFftw3 so it is both possible to run CI and produce …

…exportable binary
SciNim · May 21, 2021 · fb659ec · fb659ec
1 parent e3667e3
commit fb659ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         run: nimble localinstallfftw
         env:
           LD_LIBRARY_PATH: ${PWD}/third_parth/lib
-      - run: testament r tests/testall.nim
+      - run: testament r tests/testall.nim -d:localFftw3
         env:
           LD_LIBRARY_PATH: ${PWD}/third_parth/lib
       - run: nimble gendoc

diff --git a/fftw3.nimble b/fftw3.nimble
@@ -14,7 +14,7 @@ requires "zippy"
 
 import os
 task gendoc, "gen doc":
-  exec("nimble doc --threads:on --project fftw3.nim --out:docs/")
+  exec("nimble doc --threads:on --project fftw3.nim -d:localFftw3 --out:docs/")
 
 task installfftw, "Install FFTW-3.3.9":
   selfExec("r fftw3/install/fftwinstall.nim")

diff --git a/fftw3/libutils.nim b/fftw3/libutils.nim
@@ -9,8 +9,11 @@ elif defined(macosx):
 else:
   const Fftw3LibName* = "libfftw3.so.(|3|3.6.9)"
 
-# const Fftw3LibPath = currentSourcePath().parentDir().parentDir() / "third_party" / "lib"
-const Fftw3Lib* = Fftw3LibName
+when defined(localFftw3):
+  const Fftw3LibPath = currentSourcePath().parentDir().parentDir() / "third_party" / "lib"
+  const Fftw3Lib* = Fftw3LibPath / Fftw3LibName
+else:
+  const Fftw3Lib* = Fftw3LibName
 # static:
 #   debugEcho "nim-fftw3> Using dynamic library: ", Fftw3Lib