From ec7c804af0a205ff630ca680f70a9ba04f7c2b68 Mon Sep 17 00:00:00 2001 From: Gordon McCann Date: Wed, 8 Jun 2022 11:20:02 -0400 Subject: [PATCH] Changed structure to organize core library in own directory (matches build pathing) --- CMakeLists.txt | 6 +++--- abundance_database.cpp => catima/abundance_database.cpp | 0 abundance_database.h => catima/abundance_database.h | 0 calculations.cpp => catima/calculations.cpp | 0 calculations.h => catima/calculations.h | 0 catima.cpp => catima/catima.cpp | 0 catima.h => catima/catima.h | 0 config.h => catima/config.h | 0 constants.h => catima/constants.h | 0 convert.h => catima/convert.h | 0 cwrapper.cpp => catima/cwrapper.cpp | 0 cwrapper.h => catima/cwrapper.h | 0 data_atima.h => catima/data_atima.h | 0 .../data_ionisation_potential.h | 0 generated_LS_coeff.h => catima/generated_LS_coeff.h | 0 gwm_integrators.cpp => catima/gwm_integrators.cpp | 0 gwm_integrators.h => catima/gwm_integrators.h | 0 integrator.cpp => catima/integrator.cpp | 0 integrator.h => catima/integrator.h | 0 material_database.cpp => catima/material_database.cpp | 0 material_database.h => catima/material_database.h | 0 nucdata.cpp => catima/nucdata.cpp | 0 nucdata.h => catima/nucdata.h | 0 reactions.cpp => catima/reactions.cpp | 0 reactions.h => catima/reactions.h | 0 spline.h => catima/spline.h | 0 srim.cpp => catima/srim.cpp | 0 srim.h => catima/srim.h | 0 storage.cpp => catima/storage.cpp | 0 storage.h => catima/storage.h | 0 structures.cpp => catima/structures.cpp | 0 structures.h => catima/structures.h | 0 32 files changed, 3 insertions(+), 3 deletions(-) rename abundance_database.cpp => catima/abundance_database.cpp (100%) rename abundance_database.h => catima/abundance_database.h (100%) rename calculations.cpp => catima/calculations.cpp (100%) rename calculations.h => catima/calculations.h (100%) rename catima.cpp => catima/catima.cpp (100%) rename catima.h => catima/catima.h (100%) rename config.h => catima/config.h (100%) rename constants.h => catima/constants.h (100%) rename convert.h => catima/convert.h (100%) rename cwrapper.cpp => catima/cwrapper.cpp (100%) rename cwrapper.h => catima/cwrapper.h (100%) rename data_atima.h => catima/data_atima.h (100%) rename data_ionisation_potential.h => catima/data_ionisation_potential.h (100%) rename generated_LS_coeff.h => catima/generated_LS_coeff.h (100%) rename gwm_integrators.cpp => catima/gwm_integrators.cpp (100%) rename gwm_integrators.h => catima/gwm_integrators.h (100%) rename integrator.cpp => catima/integrator.cpp (100%) rename integrator.h => catima/integrator.h (100%) rename material_database.cpp => catima/material_database.cpp (100%) rename material_database.h => catima/material_database.h (100%) rename nucdata.cpp => catima/nucdata.cpp (100%) rename nucdata.h => catima/nucdata.h (100%) rename reactions.cpp => catima/reactions.cpp (100%) rename reactions.h => catima/reactions.h (100%) rename spline.h => catima/spline.h (100%) rename srim.cpp => catima/srim.cpp (100%) rename srim.h => catima/srim.h (100%) rename storage.cpp => catima/storage.cpp (100%) rename storage.h => catima/storage.h (100%) rename structures.cpp => catima/structures.cpp (100%) rename structures.h => catima/structures.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index af30111..c45b3c9 100644 --- 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) diff --git a/abundance_database.cpp b/catima/abundance_database.cpp similarity index 100% rename from abundance_database.cpp rename to catima/abundance_database.cpp diff --git a/abundance_database.h b/catima/abundance_database.h similarity index 100% rename from abundance_database.h rename to catima/abundance_database.h diff --git a/calculations.cpp b/catima/calculations.cpp similarity index 100% rename from calculations.cpp rename to catima/calculations.cpp diff --git a/calculations.h b/catima/calculations.h similarity index 100% rename from calculations.h rename to catima/calculations.h diff --git a/catima.cpp b/catima/catima.cpp similarity index 100% rename from catima.cpp rename to catima/catima.cpp diff --git a/catima.h b/catima/catima.h similarity index 100% rename from catima.h rename to catima/catima.h diff --git a/config.h b/catima/config.h similarity index 100% rename from config.h rename to catima/config.h diff --git a/constants.h b/catima/constants.h similarity index 100% rename from constants.h rename to catima/constants.h diff --git a/convert.h b/catima/convert.h similarity index 100% rename from convert.h rename to catima/convert.h diff --git a/cwrapper.cpp b/catima/cwrapper.cpp similarity index 100% rename from cwrapper.cpp rename to catima/cwrapper.cpp diff --git a/cwrapper.h b/catima/cwrapper.h similarity index 100% rename from cwrapper.h rename to catima/cwrapper.h diff --git a/data_atima.h b/catima/data_atima.h similarity index 100% rename from data_atima.h rename to catima/data_atima.h diff --git a/data_ionisation_potential.h b/catima/data_ionisation_potential.h similarity index 100% rename from data_ionisation_potential.h rename to catima/data_ionisation_potential.h diff --git a/generated_LS_coeff.h b/catima/generated_LS_coeff.h similarity index 100% rename from generated_LS_coeff.h rename to catima/generated_LS_coeff.h diff --git a/gwm_integrators.cpp b/catima/gwm_integrators.cpp similarity index 100% rename from gwm_integrators.cpp rename to catima/gwm_integrators.cpp diff --git a/gwm_integrators.h b/catima/gwm_integrators.h similarity index 100% rename from gwm_integrators.h rename to catima/gwm_integrators.h diff --git a/integrator.cpp b/catima/integrator.cpp similarity index 100% rename from integrator.cpp rename to catima/integrator.cpp diff --git a/integrator.h b/catima/integrator.h similarity index 100% rename from integrator.h rename to catima/integrator.h diff --git a/material_database.cpp b/catima/material_database.cpp similarity index 100% rename from material_database.cpp rename to catima/material_database.cpp diff --git a/material_database.h b/catima/material_database.h similarity index 100% rename from material_database.h rename to catima/material_database.h diff --git a/nucdata.cpp b/catima/nucdata.cpp similarity index 100% rename from nucdata.cpp rename to catima/nucdata.cpp diff --git a/nucdata.h b/catima/nucdata.h similarity index 100% rename from nucdata.h rename to catima/nucdata.h diff --git a/reactions.cpp b/catima/reactions.cpp similarity index 100% rename from reactions.cpp rename to catima/reactions.cpp diff --git a/reactions.h b/catima/reactions.h similarity index 100% rename from reactions.h rename to catima/reactions.h diff --git a/spline.h b/catima/spline.h similarity index 100% rename from spline.h rename to catima/spline.h diff --git a/srim.cpp b/catima/srim.cpp similarity index 100% rename from srim.cpp rename to catima/srim.cpp diff --git a/srim.h b/catima/srim.h similarity index 100% rename from srim.h rename to catima/srim.h diff --git a/storage.cpp b/catima/storage.cpp similarity index 100% rename from storage.cpp rename to catima/storage.cpp diff --git a/storage.h b/catima/storage.h similarity index 100% rename from storage.h rename to catima/storage.h diff --git a/structures.cpp b/catima/structures.cpp similarity index 100% rename from structures.cpp rename to catima/structures.cpp diff --git a/structures.h b/catima/structures.h similarity index 100% rename from structures.h rename to catima/structures.h