Changed structure to organize core library in own directory (matches build pathing)

2024-05-19 23:33:19 -04:00 · 2022-06-08 11:20:02 -04:00 · 2022-06-08 11:20:02 -04:00 · ec7c804af0
parent 2b990bd1e3
commit ec7c804af0
32 changed files with 3 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -58,12 +58,12 @@ configure_file("${PROJECT_SOURCE_DIR}/init.sh.in"
               "${PROJECT_BINARY_DIR}/init.sh")
 ############### main build ###########################

-file(GLOB SOURCES *.cpp)
+file(GLOB SOURCES catima/*.cpp)
 if(GLOBAL)
 file(GLOB GLOBAL_SOURCES global/*.c)
 LIST (APPEND SOURCES ${GLOBAL_SOURCES})
 endif(GLOBAL)
-file(GLOB HEADERS *.h libs/*.h)
+file(GLOB HEADERS catima/*.h libs/*.h)

 add_library(catima ${SOURCES})
 set_target_properties(catima PROPERTIES
@ -151,7 +151,7 @@ add_subdirectory("bin")
 endif(APPS)

 ####### install part #######
-FILE(GLOB headers "*.h")
+FILE(GLOB headers "catima/*.h")
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)

--- a/catima/abundance_database.cpp
+++ b/catima/abundance_database.cpp
--- a/catima/abundance_database.h
+++ b/catima/abundance_database.h
--- a/catima/calculations.cpp
+++ b/catima/calculations.cpp
--- a/catima/calculations.h
+++ b/catima/calculations.h
--- a/catima/catima.cpp
+++ b/catima/catima.cpp
--- a/catima/catima.h
+++ b/catima/catima.h
--- a/catima/config.h
+++ b/catima/config.h
--- a/catima/constants.h
+++ b/catima/constants.h
--- a/catima/convert.h
+++ b/catima/convert.h
--- a/catima/cwrapper.cpp
+++ b/catima/cwrapper.cpp
--- a/catima/cwrapper.h
+++ b/catima/cwrapper.h
--- a/catima/data_atima.h
+++ b/catima/data_atima.h
--- a/catima/data_ionisation_potential.h
+++ b/catima/data_ionisation_potential.h
--- a/catima/generated_LS_coeff.h
+++ b/catima/generated_LS_coeff.h
--- a/catima/gwm_integrators.cpp
+++ b/catima/gwm_integrators.cpp
--- a/catima/gwm_integrators.h
+++ b/catima/gwm_integrators.h
--- a/catima/integrator.cpp
+++ b/catima/integrator.cpp
--- a/catima/integrator.h
+++ b/catima/integrator.h
--- a/catima/material_database.cpp
+++ b/catima/material_database.cpp
--- a/catima/material_database.h
+++ b/catima/material_database.h
--- a/catima/nucdata.cpp
+++ b/catima/nucdata.cpp
--- a/catima/nucdata.h
+++ b/catima/nucdata.h
--- a/catima/reactions.cpp
+++ b/catima/reactions.cpp
--- a/catima/reactions.h
+++ b/catima/reactions.h
--- a/catima/spline.h
+++ b/catima/spline.h
--- a/catima/srim.cpp
+++ b/catima/srim.cpp
--- a/catima/srim.h
+++ b/catima/srim.h
--- a/catima/storage.cpp
+++ b/catima/storage.cpp
--- a/catima/storage.h
+++ b/catima/storage.h
--- a/catima/structures.cpp
+++ b/catima/structures.cpp
--- a/catima/structures.h
+++ b/catima/structures.h