diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2017-12-08 15:40:10 +0200 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2018-01-18 14:10:26 +0100 |
| commit | dbad8e29e272ad310c29eaa487aa8627c38c1521 (patch) | |
| tree | d1a55ff35141a01356e15bda3658809d59d171f8 | |
| parent | bbd0e337f744abfea23b6d77d4b4bb340069f18e (diff) | |
Add missing tests to sdist, check for Cabal 2.0 for CFlib
| -rw-r--r-- | cabal-helper.cabal | 4 | ||||
| -rw-r--r-- | src/CabalHelper/Runtime/Main.hs | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/cabal-helper.cabal b/cabal-helper.cabal index ece81c1..c580101 100644 --- a/cabal-helper.cabal +++ b/cabal-helper.cabal @@ -46,6 +46,10 @@ extra-source-files: README.md tests/exeintlib/lib/*.hs tests/exeintlib/intlib/*.hs + tests/fliblib/*.hs + tests/fliblib/*.cabal + tests/fliblib/lib/*.hs + tests/bkpregex/*.cabal tests/bkpregex/*.hs tests/bkpregex/regex-example/*.hs diff --git a/src/CabalHelper/Runtime/Main.hs b/src/CabalHelper/Runtime/Main.hs index b433b8b..e6d7a22 100644 --- a/src/CabalHelper/Runtime/Main.hs +++ b/src/CabalHelper/Runtime/Main.hs @@ -641,8 +641,10 @@ componentNameFromComponent (CBench Benchmark {..}) = CBenchName benchmarkName componentOutDir lbi (CLib Library {..})= buildDir lbi +#if CH_MIN_VERSION_Cabal(2,0,0) componentOutDir lbi (CFLib ForeignLib {..}) = componentOutDir' lbi (unUnqualComponentName foreignLibName) +#endif componentOutDir lbi (CExe Executable {..}) = componentOutDir' lbi (unUnqualComponentName' exeName) componentOutDir lbi (CTest TestSuite { testInterface = TestSuiteExeV10 _ _, ..}) = |