Move headers to include/ssht

astro-informatics · Oct 16, 2020 · e3e1d5f · e3e1d5f
1 parent 0202d1c
commit e3e1d5f
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 35 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,5 +2,6 @@ include CMakeLists.txt
 include setup.py setup.cfg pyproject.toml
 include COPYRIGHT.txt LICENSE.md README.md
 include cmake/*.cmake
-recursive-include src/c *.c *.h CMakeLists.txt
+recursive-include src/c *.c CMakeLists.txt
+recursive-include include/ssht *.h CMakeLists.txt
 recursive-include src/pyssht .py *.pyx *.md CMakeLists.txt
diff --git a/src/c/ssht.h → include/ssht/ssht.h b/src/c/ssht.h → include/ssht/ssht.h
diff --git a/src/c/ssht_adjoint.h → include/ssht/ssht_adjoint.h b/src/c/ssht_adjoint.h → include/ssht/ssht_adjoint.h
diff --git a/src/c/ssht_core.h → include/ssht/ssht_core.h b/src/c/ssht_core.h → include/ssht/ssht_core.h
diff --git a/src/c/ssht_dl.h → include/ssht/ssht_dl.h b/src/c/ssht_dl.h → include/ssht/ssht_dl.h
diff --git a/src/c/ssht_error.h → include/ssht/ssht_error.h b/src/c/ssht_error.h → include/ssht/ssht_error.h
diff --git a/src/c/ssht_sampling.h → include/ssht/ssht_sampling.h b/src/c/ssht_sampling.h → include/ssht/ssht_sampling.h
diff --git a/src/c/ssht_types.h → include/ssht/ssht_types.h b/src/c/ssht_types.h → include/ssht/ssht_types.h
diff --git a/src/c/ssht_version.in.h → include/ssht/ssht_version.in.h b/src/c/ssht_version.in.h → include/ssht/ssht_version.in.h
diff --git a/src/c/CMakeLists.txt b/src/c/CMakeLists.txt
@@ -2,11 +2,13 @@ add_library(ssht STATIC ssht_adjoint.c ssht_core.c ssht_dl.c ssht_sampling.c)
 target_link_libraries(ssht PUBLIC ${FFTW3_TARGET} m)
 target_include_directories(
   ssht
-  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+  PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+         $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
          $<INSTALL_INTERFACE:include>)
-set_target_properties(ssht PROPERTIES C_STANDARD 99)
-configure_file(ssht_version.in.h ${CMAKE_CURRENT_BINARY_DIR}/ssht_version.h)
+set_target_properties(ssht PROPERTIES C_STANDARD 99 ARCHIVE_OUTPUT_DIRECTORY
+                                                    ${PROJECT_BINARY_DIR}/lib)
+configure_file(${PROJECT_SOURCE_DIR}/include/ssht/ssht_version.in.h
+               ${PROJECT_BINARY_DIR}/include/ssht/ssht_version.h)
 
 if(fPIC)
   set_target_properties(ssht PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
@@ -19,13 +21,13 @@ if(NOT python)
     ARCHIVE DESTINATION lib
     PUBLIC_HEADER)
   install(
-    FILES ssht_adjoint.h
-          ssht_dl.h
-          ssht_sampling.h
-          ssht_core.h
-          ssht_error.h
-          ssht_types.h
-          ${CMAKE_CURRENT_BINARY_DIR}/ssht_version.h
-          ssht.h
+    FILES ${PROJECT_SOURCE_DIR}/include/ssht/ssht_adjoint.h
+          ${PROJECT_SOURCE_DIR}/include/ssht/ssht_dl.h
+          ${PROJECT_SOURCE_DIR}/include/ssht/ssht_sampling.h
+          ${PROJECT_SOURCE_DIR}/include/ssht/ssht_core.h
+          ${PROJECT_SOURCE_DIR}/include/ssht/ssht_error.h
+          ${PROJECT_SOURCE_DIR}/include/ssht/ssht_types.h
+          ${CMAKE_CURRENT_BINARY_DIR}/include/ssht/ssht_version.h
+          ${PROJECT_SOURCE_DIR}/include/ssht/ssht.h
     DESTINATION include/ssht)
 endif()
diff --git a/src/c/ssht_about.c b/src/c/ssht_about.c
@@ -14,7 +14,7 @@
 
 #include <stdio.h>
 #ifdef BUILT_WITH_CMAKE
-#include "ssht_version.h"
+#include "ssht/ssht_version.h"
 #endif
 
 int main(void) {

diff --git a/src/c/ssht_adjoint.c b/src/c/ssht_adjoint.c
@@ -18,11 +18,11 @@
 #include <tgmath.h>  // Must be before fftw3.h
 #include <fftw3.h>
 
-#include "ssht_types.h"
-#include "ssht_error.h"
-#include "ssht_dl.h"
-#include "ssht_sampling.h"
-#include "ssht_adjoint.h"
+#include "ssht/ssht_types.h"
+#include "ssht/ssht_error.h"
+#include "ssht/ssht_dl.h"
+#include "ssht/ssht_sampling.h"
+#include "ssht/ssht_adjoint.h"
 
 
 //============================================================================

diff --git a/src/c/ssht_core.c b/src/c/ssht_core.c
@@ -18,11 +18,11 @@
 #include <tgmath.h>
 #include <fftw3.h>
 
-#include "ssht_types.h"
-#include "ssht_error.h"
-#include "ssht_dl.h"
-#include "ssht_sampling.h"
-#include "ssht_core.h"
+#include "ssht/ssht_types.h"
+#include "ssht/ssht_error.h"
+#include "ssht/ssht_dl.h"
+#include "ssht/ssht_sampling.h"
+#include "ssht/ssht_core.h"
 
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 

diff --git a/src/c/ssht_dl.c b/src/c/ssht_dl.c
@@ -41,9 +41,9 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include "ssht_types.h"
-#include "ssht_error.h"
-#include "ssht_dl.h"
+#include "ssht/ssht_types.h"
+#include "ssht/ssht_error.h"
+#include "ssht/ssht_dl.h"
 
 double logfact(int n);
 

diff --git a/src/c/ssht_sampling.c b/src/c/ssht_sampling.c
@@ -11,7 +11,7 @@
  */
 
 
-#include "ssht_types.h"
+#include "ssht/ssht_types.h"
 
 #define ABS(x) ((x) >= 0 ? (x) : -(x))
 

diff --git a/src/c/ssht_test.c b/src/c/ssht_test.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "ssht.h"
+#include "ssht/ssht.h"
 
 #define NREPEAT 5
 #define MAX(a, b) ((a) > (b) ? (a) : (b))

diff --git a/tests/interface.c b/tests/interface.c
@@ -1,7 +1,7 @@
 #include <string.h>
 
 #include "interface.h"
-#include "ssht.h"
+#include "ssht/ssht.h"
 #include "utilities.h"
 
 void ssht_real_inverse(

diff --git a/tests/interface.h b/tests/interface.h
@@ -3,8 +3,8 @@
 
 #include <stddef.h>
 
-#include "ssht_dl.h"
-#include "ssht_types.h"
+#include "ssht/ssht_dl.h"
+#include "ssht/ssht_types.h"
 
 /*! Identifies different implementation of the transforms. */
 typedef enum {

diff --git a/tests/test_ssht.c b/tests/test_ssht.c
@@ -7,8 +7,8 @@
 #include <string.h>
 
 #include "interface.h"
-#include "ssht.h"
-#include "ssht_error.h"
+#include "ssht/ssht.h"
+#include "ssht/ssht_error.h"
 #include "utilities.h"
 
 #include <cmocka.h>

diff --git a/tests/utilities.c b/tests/utilities.c
@@ -1,4 +1,4 @@
-#include "ssht.h"
+#include "ssht/ssht.h"
 #include "utilities.h"
 
 #include <complex.h>