From eb12ba72ad675db7b52ebffe81918f7f95ad8585 Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Wed, 6 Mar 2024 01:14:47 +0000
Subject: [PATCH] Fixing pipelines
---
CMakeLists.txt | 9 +++++++++
tests/CMakeLists.txt | 39 ---------------------------------------
2 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6d6ee5..4127919 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,15 @@ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../MODELS")
message(FATAL_ERROR "MODELS module not found.")
endif()
+include(ExternalProject)
+ExternalProject_Add(Tadah.MODELS
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../MODELS
+ BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../MODELS/build
+ INSTALL_COMMAND cmake -E echo "Skipping install step."
+ )
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../MODELS/build)
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../CORE/build)
+
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 09d2a1f..80247ff 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,47 +11,8 @@ FetchContent_MakeAvailable(Catch2)
file(GLOB tests_src "*.cpp")
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/tests_data DESTINATION .)
-include(ExternalProject)
-#ExternalProject_Add(Tadah.CORE
-# SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../CORE
-# BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../CORE/build
-# INSTALL_COMMAND cmake -E echo "Skipping install step."
-# )
-link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../CORE/build)
-
-ExternalProject_Add(Tadah.MODELS
- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../MODELS
- BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../MODELS/build
- INSTALL_COMMAND cmake -E echo "Skipping install step."
- )
-link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../MODELS/build)
-
-#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 tadah.core tadah.models)
-#target_link_libraries(test_mlip PRIVATE Catch2::Catch2 tadah.mlip ${tadah.core} ${tadah.models})
if(TADAH_ENABLE_OPENMP)
find_package(OpenMP REQUIRED)
--
GitLab