From 02232a56e36db69df32f56c794778ce5270483a5 Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Mon, 21 Oct 2024 21:26:47 +0100
Subject: [PATCH] Fixed tests linking and include
---
tests/CMakeLists.txt | 6 +++++-
tests/test_factory_models.cpp | 22 +++++++++++-----------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index aeea912..4e424a7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,7 +3,11 @@ file(GLOB tests_src "*.cpp")
#file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/tests_data DESTINATION .)
add_executable(test_tadah ${tests_src})
-target_link_libraries(test_tadah PRIVATE Catch2 libtadah)
+target_link_libraries(test_tadah PRIVATE Catch2 tadah.mlip)
+target_include_directories(test_tadah PRIVATE ${Tadah.CORE_SOURCE_DIR}/include)
+target_include_directories(test_tadah PRIVATE ${Tadah.CORE_SOURCE_DIR}/external/toml11)
+target_include_directories(test_tadah PRIVATE ${Tadah.MODELS_SOURCE_DIR}/include)
+target_include_directories(test_tadah PRIVATE ${Tadah.MLIP_SOURCE_DIR}/include)
include(Catch.cmake)
catch_discover_tests(test_tadah)
diff --git a/tests/test_factory_models.cpp b/tests/test_factory_models.cpp
index dbfe69c..efb2728 100644
--- a/tests/test_factory_models.cpp
+++ b/tests/test_factory_models.cpp
@@ -3,17 +3,17 @@
#include <stdexcept>
#include <string>
-#include "../CORE/registry.h"
-#include "../CORE/config/config.h"
-#include "../MODELS/cutoffs/cutoffs.h"
-#include "../MODELS/descriptors/d_all.h"
-#include "../MODELS/functions/basis_functions/bf_all.h"
-#include "../MODELS/functions/kernels/kern_all.h"
-#include "../MLIP/models/m_all.h"
-#include "../MLIP/structure_db.h"
-#include "../MLIP/st_descriptors_db.h"
-#include "../MLIP/nn_finder.h"
-#include "../MLIP/design_matrix/functions/dm_function_base.h"
+#include <tadah/core/registry.h>
+#include <tadah/core/config.h>
+#include <tadah/models/cutoffs.h>
+#include <tadah/models/descriptors/d_all.h>
+#include <tadah/models/functions/basis_functions/bf_all.h>
+#include <tadah/models/functions/kernels/kern_all.h>
+#include <tadah/mlip/models/m_all.h>
+#include <tadah/mlip/structure_db.h>
+#include <tadah/mlip/st_descriptors_db.h>
+#include <tadah/mlip/nn_finder.h>
+#include <tadah/mlip/design_matrix/functions/dm_function_base.h>
using BF=BF_Linear;
using K=Kern_Linear;
--
GitLab