tidied up location of cpp files by defining include dir

jeremymcrae · Jun 6, 2017 · a4d468e · a4d468e
1 parent 7cf7c1c
commit a4d468e
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,8 +6,6 @@ cache/
 build/
 dist/
 results/
-denovonear/weights.cpp
-denovonear/transcript.cpp
-denovonear/site_specific_rates.cpp
+denovonear/*.cpp
 *.egg-info/
 *.so
diff --git a/setup.py b/setup.py
@@ -13,22 +13,25 @@
     Extension("denovonear.weights",
         extra_compile_args=EXTRA_COMPILE_ARGS,
         sources=["denovonear/weights.pyx",
-            "denovonear/weighted_choice.cpp",
-            "denovonear/simulate.cpp"],
+            "src/weighted_choice.cpp",
+            "src/simulate.cpp"],
+        include_dirs=["src/"],
         language="c++"),
     Extension("denovonear.transcript",
         extra_compile_args=EXTRA_COMPILE_ARGS,
         sources=[
             "denovonear/transcript.pyx",
-            "denovonear/tx.cpp"],
+            "src/tx.cpp"],
+        include_dirs=["src/"],
         language="c++"),
     Extension("denovonear.site_specific_rates",
         extra_compile_args=EXTRA_COMPILE_ARGS,
         sources=[
             "denovonear/site_specific_rates.pyx",
-            "denovonear/weighted_choice.cpp",
-            "denovonear/tx.cpp",
-            "denovonear/site_rates.cpp"],
+            "src/weighted_choice.cpp",
+            "src/tx.cpp",
+            "src/site_rates.cpp"],
+        include_dirs=["src/"],
         language="c++"),
     ])
 

diff --git a/denovonear/simulate.cpp → src/simulate.cpp b/denovonear/simulate.cpp → src/simulate.cpp
diff --git a/denovonear/simulate.h → src/simulate.h b/denovonear/simulate.h → src/simulate.h
diff --git a/denovonear/site_rates.cpp → src/site_rates.cpp b/denovonear/site_rates.cpp → src/site_rates.cpp
diff --git a/denovonear/site_rates.h → src/site_rates.h b/denovonear/site_rates.h → src/site_rates.h
diff --git a/denovonear/tx.cpp → src/tx.cpp b/denovonear/tx.cpp → src/tx.cpp
diff --git a/denovonear/tx.h → src/tx.h b/denovonear/tx.h → src/tx.h
diff --git a/denovonear/weighted_choice.cpp → src/weighted_choice.cpp b/denovonear/weighted_choice.cpp → src/weighted_choice.cpp
diff --git a/denovonear/weighted_choice.h → src/weighted_choice.h b/denovonear/weighted_choice.h → src/weighted_choice.h