X-Git-Url: http://gitweb.michael.orlitzky.com/?p=spline3.git;a=blobdiff_plain;f=spline3.cabal;h=deabe44e64a728c257539d39b3cfff627f892953;hp=bf17664c8d4e3c55520367d31940ac8b266203e3;hb=0b3152a88d2fa4a7c75f29a2859c31ef23d27bf3;hpb=40332b68d1ee06566785e8ec4556a495b74513f2

diff --git a/spline3.cabal b/spline3.cabal
index bf17664..deabe44 100644
--- a/spline3.cabal
+++ b/spline3.cabal
@@ -31,10 +31,6 @@ extra-source-files:
   doc/results/3d/*.png
   util/view-mri-data.py
 
-flag LLVM
-  description: Build with LLVM
-  default:     False
-
 
 executable spline3
 
@@ -71,6 +67,7 @@ executable spline3
     FunctionValues
     Grid
     Misc
+    Paths_spline3
     Point
     RealFunction
     ScaleFactor
@@ -79,35 +76,21 @@ executable spline3
     Volumetric
 
   ghc-options:
-    -Wall
-    -fwarn-hi-shadowing
-    -fwarn-missing-signatures
-    -fwarn-name-shadowing
-    -fwarn-orphans
-    -fwarn-type-defaults
-    -fwarn-tabs
-    -fwarn-incomplete-record-updates
-    -fwarn-monomorphism-restriction
-    -fwarn-unused-do-bind
+    -Weverything
+    -Wno-implicit-prelude
+    -Wno-safe
+    -Wno-unsafe
+    -Wno-all-missed-specialisations
     -funbox-strict-fields
     -fexcess-precision
     -fno-spec-constr-count
     -rtsopts
     -threaded
-
-  if flag(llvm)
-    ghc-options:
-      -fllvm
-      -optlo-O3
-      -optlc-O3
-  else
-    ghc-options:
-      -O2
-      -optc-O3
-      -optc-march=native
+    -O2
+    -optc-O3
+    -optc-march=native
 
   ghc-prof-options:
-    -prof
     -auto-all
     -caf-all
 
@@ -123,28 +106,42 @@ test-suite doctests
 
   -- It's not entirely clear to me why I have to reproduce all of this.
   ghc-options:
+    -Weverything
+    -Wno-implicit-prelude
+    -Wno-safe
+    -Wno-unsafe
+    -Wno-all-missed-specialisations
     -rtsopts
     -threaded
     -funbox-strict-fields
     -fexcess-precision
     -fno-spec-constr-count
-
-  if flag(llvm)
-    ghc-options:
-      -fllvm
-      -optlo-O3
-      -optlc-O3
-  else
-    ghc-options:
-      -O2
-      -optc-O3
-      -optc-march=native
+    -O2
+    -optc-O3
+    -optc-march=native
 
 
 test-suite testsuite
   type: exitcode-stdio-1.0
   hs-source-dirs: src test
   main-is: TestSuite.hs
+
+  other-modules:
+    Assertions
+    Cardinal
+    Comparisons
+    Cube
+    Examples
+    Face
+    FunctionValues
+    Grid
+    Misc
+    Point
+    RealFunction
+    ScaleFactor
+    Tetrahedron
+    Values
+
   build-depends:
     base                        < 5,
     cmdargs                     >= 0.10,
@@ -161,22 +158,21 @@ test-suite testsuite
 
   -- It's not entirely clear to me why I have to reproduce all of this.
   ghc-options:
+    -Weverything
+    -Wno-implicit-prelude
+    -Wno-safe
+    -Wno-unsafe
+    -Wno-all-missed-specialisations
     -rtsopts
     -threaded
     -funbox-strict-fields
     -fexcess-precision
     -fno-spec-constr-count
 
-  if flag(llvm)
-    ghc-options:
-      -fllvm
-      -optlo-O3
-      -optlc-O3
-  else
-    ghc-options:
-      -O2
-      -optc-O3
-      -optc-march=native
+  ghc-options:
+    -O2
+    -optc-O3
+    -optc-march=native
 
 
 source-repository head