diff --git a/.gitignore b/.gitignore index d5a1572f8a32057105977db2333539ea0cb5350d..e6a76cfd5bd92e394f0e772cb63e52d526b16e9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.swp +*.swo build diff --git a/CMakeLists.txt b/CMakeLists.txt index c848a6d8d71aa441913a757ffa50d1b6705a474d..7d58ca3f24c981900c5f9ea250a0346e23b09eb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,20 +14,25 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} You may need to remove CMakeCache.txt and CMakeFiles dir. ") endif() -# check required modules are present -if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../CORE") - message("This module requires CORE module for compilation.") - message(FATAL_ERROR "CORE module not found.") -endif() - include(ExternalProject) ExternalProject_Add(Tadah.CORE + GIT_REPOSITORY git@git.ecdf.ed.ac.uk:tadah/core.git + GIT_TAG main SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../CORE + PATCH_COMMAND mkdir -p build BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../CORE/build INSTALL_COMMAND cmake -E echo "Skipping install step." ) + +# check required modules are present +if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../CORE") + message("This module requires CORE module for compilation.") + message(FATAL_ERROR "CORE module not found.") +endif() + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../CORE/build) + set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF)