refactor: move public headers to include/

ntamas · Nov 17, 2024 · c98d8be · c98d8be
1 parent 3a7b366
commit c98d8be
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,8 +97,8 @@ set(CMAKE_C_VISIBILITY_PRESET hidden)
 
 # Add version information
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/plfit_version.h.in
-    ${CMAKE_CURRENT_BINARY_DIR}/src/plfit_version.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/plfit_version.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/include/plfit_version.h
 )
 
 add_subdirectory(src)

diff --git a/src/plfit.h → include/plfit.h b/src/plfit.h → include/plfit.h
@@ -23,7 +23,9 @@
 
 #include <stdlib.h>
 #include "plfit_decls.h"
+#include "plfit_error.h"
 #include "plfit_mt.h"
+#include "plfit_sampling.h"
 #include "plfit_version.h"
 
 __BEGIN_DECLS

diff --git a/src/plfit_decls.h → include/plfit_decls.h b/src/plfit_decls.h → include/plfit_decls.h
diff --git a/src/plfit_error.h → include/plfit_error.h b/src/plfit_error.h → include/plfit_error.h
diff --git a/src/plfit_mt.h → include/plfit_mt.h b/src/plfit_mt.h → include/plfit_mt.h
diff --git a/src/plfit_sampling.h → include/plfit_sampling.h b/src/plfit_sampling.h → include/plfit_sampling.h
diff --git a/src/plfit_version.h.in → include/plfit_version.h.in b/src/plfit_version.h.in → include/plfit_version.h.in
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,7 +11,13 @@ endif()
 set(PLFIT_CORE_SRCS error.c gss.c kolmogorov.c lbfgs.c mt.c plfit.c options.c rbinom.c sampling.c stats.c hzeta.c)
 
 add_library(plfit ${PLFIT_CORE_SRCS})
-target_include_directories(plfit PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(
+  plfit PUBLIC
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/include
+)
 set_target_properties(plfit PROPERTIES SOVERSION 0)
 target_link_libraries(plfit ${MATH_LIBRARY})
 
@@ -28,7 +34,7 @@ endif()
 include(GenerateExportHeader)
 generate_export_header(plfit
   STATIC_DEFINE PLFIT_STATIC
-  EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/src/plfit_export.h
+  EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/plfit_export.h
 )
 
 join_paths(libdir_for_pc_file "\${exec_prefix}" "${CMAKE_INSTALL_LIBDIR}")
@@ -38,13 +44,13 @@ configure_file(${PROJECT_SOURCE_DIR}/libplfit.pc.in ${PROJECT_BINARY_DIR}/libplf
 install(TARGETS plfit LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 install(
     FILES
-    ${PROJECT_SOURCE_DIR}/src/plfit.h
-    ${PROJECT_SOURCE_DIR}/src/plfit_decls.h
-    ${PROJECT_SOURCE_DIR}/src/plfit_error.h
-    ${PROJECT_BINARY_DIR}/src/plfit_export.h
-    ${PROJECT_SOURCE_DIR}/src/plfit_mt.h
-    ${PROJECT_SOURCE_DIR}/src/plfit_sampling.h
-    ${PROJECT_BINARY_DIR}/src/plfit_version.h
+    ${PROJECT_SOURCE_DIR}/include/plfit.h
+    ${PROJECT_SOURCE_DIR}/include/plfit_decls.h
+    ${PROJECT_SOURCE_DIR}/include/plfit_error.h
+    ${PROJECT_BINARY_DIR}/include/plfit_export.h
+    ${PROJECT_SOURCE_DIR}/include/plfit_mt.h
+    ${PROJECT_SOURCE_DIR}/include/plfit_sampling.h
+    ${PROJECT_BINARY_DIR}/include/plfit_version.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/plfit
 )
 install(
@@ -81,7 +87,10 @@ if(PLFIT_COMPILE_PYTHON_MODULE)
 
     target_include_directories(
         plfit_python PUBLIC
-        ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_BINARY_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_SOURCE_DIR}/include
         ${Python3_INCLUDE_DIRS}
     )
 

diff --git a/src/plfit.c b/src/plfit.c
@@ -24,12 +24,10 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include "plfit_error.h"
 #include "gss.h"
 #include "lbfgs.h"
 #include "plfit.h"
 #include "kolmogorov.h"
-#include "plfit_sampling.h"
 #include "hzeta.h"
 
 /* #define PLFIT_DEBUG */

diff --git a/src/plgen.c b/src/plgen.c
@@ -24,7 +24,6 @@
 #include <time.h>
 #include "getopt.h"
 #include "plfit.h"
-#include "plfit_sampling.h"
 
 typedef struct _cmd_options_t {
     long int num_samples;

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,4 +1,7 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src)
+include_directories(
+  ${CMAKE_SOURCE_DIR}/include
+  ${CMAKE_SOURCE_DIR}/src
+)
 add_definitions(-DDATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../data\")
 
 set(TEST_CASES discrete continuous real sampling underflow_handling xmin_too_low)