From b28e68c9cdfaaf919113bfdc2852052f2756ea1f Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Wed, 6 Mar 2024 12:14:10 +0000
Subject: [PATCH] Add download to ext proj
---
.gitignore | 1 +
CMakeLists.txt | 16 ++++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index d5a1572..e6a76cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.swp
+*.swo
build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4127919..c42b1fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,16 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}
You may need to remove CMakeCache.txt and CMakeFiles dir. ")
endif()
+include(ExternalProject)
+ExternalProject_Add(Tadah.MODELS
+ GIT_REPOSITORY git@git.ecdf.ed.ac.uk:tadah/models.git
+ GIT_TAG main
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../MODELS
+ PATCH_COMMAND mkdir -p build
+ BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../MODELS/build
+ INSTALL_COMMAND cmake -E echo "Skipping install step."
+ )
+
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../CORE")
message("This module requires CORE module for compilation.")
message(FATAL_ERROR "CORE module not found.")
@@ -24,12 +34,6 @@ 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)
--
GitLab