From a49e927d5bf74e8e44bfa36b9541bf5d0c2b172d Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Tue, 5 Mar 2024 23:01:19 +0000
Subject: [PATCH] Fixing pipelines
---
CMakeLists.txt | 2 +-
tests/CMakeLists.txt | 25 ++++++++++++++++++++++++-
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a93681..9a8eb2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ if(TADAH_ENABLE_OPENMP)
target_link_libraries(tadah.mlip.obj PUBLIC OpenMP::OpenMP_CXX)
endif()
-add_library(tadah.mlip STATIC $<TARGET_OBJECTS:tadah.mlip.obj>)
+add_library(tadah.mlip $<TARGET_OBJECTS:tadah.mlip.obj>)
include(CTest)
if(TADAH_BUILD_TESTS)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f685729..c1b45b8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,8 +11,31 @@ FetchContent_MakeAvailable(Catch2)
file(GLOB tests_src "*.cpp")
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/tests_data DESTINATION .)
+find_library(tadah.core NAMES tadah.core
+ PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../CORE/*
+ )
+if(tadah.core)
+ message(STATUS "Found ${tadah.core}")
+else()
+ message(FATAL_ERROR "
+ Could not find ltadah.core in the CORE module.
+ Hint: Recompile CORE.
+ ")
+endif()
+find_library(tadah.models NAMES tadah.models
+ PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../MODELS/*
+ )
+if(tadah.models)
+ message(STATUS "Found ${tadah.models}")
+else()
+ message(FATAL_ERROR "
+ Could not find ltadah.models in the MODELS module.
+ Hint: Recompile MODELS.
+ ")
+endif()
+
add_executable(test_mlip ${tests_src})
-target_link_libraries(test_mlip PRIVATE Catch2::Catch2 tadah.mlip)
+target_link_libraries(test_mlip PRIVATE Catch2::Catch2 tadah.mlip ${tadah.core} ${tadah.models})
if(TADAH_ENABLE_OPENMP)
find_package(OpenMP REQUIRED)
--
GitLab