Install filters correctly

Changes motivated by packaging the library for Anaconda

.gitignore

@@ -108,3 +108,4 @@ venv
 *.includes
 
 .direnv/
+.ccls-cache/

cmake/MRCPPConfig.cmake.in

@@ -93,7 +93,7 @@ check_required_components(${PN})
 if(NOT TARGET ${PN}::mrcpp)
   get_filename_component(_fext ${${PN}_LIBRARY} EXT)
   include("${CMAKE_CURRENT_LIST_DIR}/${PN}Targets.cmake")
-  
+
   find_package(Eigen3 3.3 CONFIG REQUIRED)
   if(TARGET Eigen3::Eigen)
     message(STATUS "Using Eigen3: ${EIGEN3_ROOT_DIR} (version ${Eigen3_VERSION})")

cmake/custom/mw_filters.cmake

@@ -1,6 +1,6 @@
 set(MW_FILTER_SOURCE_DIR "${PROJECT_SOURCE_DIR}/share/mwfilters" CACHE STRING "Path to MW filters and cross-correlation coefs")
 set(MW_FILTER_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/mwfilters)
 install(
-  DIRECTORY ${MW_FILTER_DIR}
-  DESTINATION share/${PROJECT_NAME}/mwfilters
+  DIRECTORY share/mwfilters
+  DESTINATION share/${PROJECT_NAME}
   )

src/core/CrossCorrelation.cpp

@@ -59,9 +59,11 @@ CrossCorrelation::CrossCorrelation(int k, int t)
             MSG_ERROR("Unknown filter type: " << this->type);
     }
 
-    for (auto n : filter_lib_locations) {
-        if (details::directory_exists(n)) setCCCPaths(n);
-        break;
+    for (auto n : {MW_FILTER_SOURCE_DIR, MW_FILTER_INSTALL_DIR}) {
+        if (details::directory_exists(n)) {
+            setCCCPaths(n);
+            break;
+        }
     }
 
     readCCCBin();

src/core/CrossCorrelation.h

@@ -57,7 +57,6 @@ class CrossCorrelation final {
 
     std::string L_path;
     std::string R_path;
-    std::vector<std::string> filter_lib_locations = {MW_FILTER_SOURCE_DIR, MW_FILTER_INSTALL_DIR};
 };
 
 } // namespace mrcpp

src/core/MWFilter.cpp

@@ -60,9 +60,11 @@ MWFilter::MWFilter(int k, int t)
             MSG_ERROR("Unknown filter type: " << this->type);
     }
 
-    for (auto n : filter_lib_locations) {
-        if (details::directory_exists(n)) setFilterPaths(n);
-        break;
+    for (auto n : {MW_FILTER_SOURCE_DIR, MW_FILTER_INSTALL_DIR}) {
+        if (details::directory_exists(n)) {
+            setFilterPaths(n);
+            break;
+        }
     }
 
     generateBlocks();

src/core/MWFilter.h

@@ -75,7 +75,6 @@ class MWFilter final {
 
     std::string H_path;
     std::string G_path;
-    std::vector<std::string> filter_lib_locations = {MW_FILTER_SOURCE_DIR, MW_FILTER_INSTALL_DIR};
 };
 
 } // namespace mrcpp

src/treebuilders/BSCalculator.cpp

@@ -49,8 +49,10 @@ void BSCalculator::readSMatrix(const ScalingBasis &basis, char n) {
     std::string file;
     std::string path;
     for (auto l : {MW_FILTER_SOURCE_DIR, MW_FILTER_INSTALL_DIR}) {
-        if (details::directory_exists(l)) path = l;
-        break;
+        if (details::directory_exists(l)) {
+            path = l;
+            break;
+        }
     }
 
     if (basis.getScalingType() == Legendre) file = path + "/L_b-spline-deriv" + n + ".txt";

src/treebuilders/PHCalculator.cpp

@@ -48,8 +48,10 @@ void PHCalculator::readSMatrix(const ScalingBasis &basis, char n) {
     std::string file;
     std::string path;
     for (auto l : {MW_FILTER_SOURCE_DIR, MW_FILTER_INSTALL_DIR}) {
-        if (details::directory_exists(l)) path = l;
-        break;
+        if (details::directory_exists(l)) {
+            path = l;
+            break;
+        }
     }
     if (basis.getScalingType() == Legendre) file = path + "/L_ph_deriv_" + n + ".txt";
     if (basis.getScalingType() == Interpol) file = path + "/I_ph_deriv_" + n + ".txt";