From 6a186b0b90135237ccdd6503bc2d9085d0945251 Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Thu, 28 Nov 2024 09:25:23 +0000
Subject: [PATCH 1/5] Cmake update
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 019c871..913657d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ if(DEFINED ENV{CI_COMMIT_REF_NAME})
set(GIT_BRANCH "$ENV{CI_COMMIT_REF_NAME}")
else()
execute_process(
- COMMAND git rev-parse --symbolic-full-name --abbrev-ref HEAD
+ COMMAND git status | grep origin | sed -e 's/.*origin\///' -e 's/[^a-zA-Z].*//'
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE)
--
GitLab
From 618ef2643fad65fe359050911508d79d7bd77cf8 Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Thu, 28 Nov 2024 10:59:16 +0000
Subject: [PATCH 2/5] Build update
---
CMakeLists.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 913657d..35414ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,15 +46,18 @@ endif()
include(FetchContent)
+message(STATUS "${TADAH} Obtaining branch name...")
if(DEFINED ENV{CI_COMMIT_REF_NAME})
set(GIT_BRANCH "$ENV{CI_COMMIT_REF_NAME}")
else()
execute_process(
- COMMAND git status | grep origin | sed -e 's/.*origin\///' -e 's/[^a-zA-Z].*//'
+ #COMMAND git rev-parse --symbolic-full-name --abbrev-ref HEAD
+ COMMAND bash -c "git status | grep origin | sed -e 's/.*origin\\///' -e 's/[^a-zA-Z].*//'"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
+message(STATUS "${TADAH}.MLIP Using GIT_BRANCH: ${GIT_BRANCH}.")
FetchContent_Declare(
Tadah.MODELS
--
GitLab
From 9ba1a0ce0271ff3eec3e31e443ec25f9c059446f Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Thu, 28 Nov 2024 11:15:37 +0000
Subject: [PATCH 3/5] Build update
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35414ab..033cc1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ if(DEFINED ENV{CI_COMMIT_REF_NAME})
else()
execute_process(
#COMMAND git rev-parse --symbolic-full-name --abbrev-ref HEAD
- COMMAND bash -c "git status | grep origin | sed -e 's/.*origin\\///' -e 's/[^a-zA-Z].*//'"
+ COMMAND bash -c "git status | grep origin | sed -e s/.*origin\\/// -e s/[^a-zA-Z].*//"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE)
--
GitLab
From edaac2144bf3c2e099bcdfa4f3783b57479ec8ab Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Thu, 28 Nov 2024 11:27:24 +0000
Subject: [PATCH 4/5] Build update
---
CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 033cc1d..4db039f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,13 +46,13 @@ endif()
include(FetchContent)
-message(STATUS "${TADAH} Obtaining branch name...")
if(DEFINED ENV{CI_COMMIT_REF_NAME})
set(GIT_BRANCH "$ENV{CI_COMMIT_REF_NAME}")
+elseif(DEFINED ENV{READTHEDOCS})
+ set(GIT_BRANCH "$ENV{READTHEDOCS_PROJECT}")
else()
execute_process(
- #COMMAND git rev-parse --symbolic-full-name --abbrev-ref HEAD
- COMMAND bash -c "git status | grep origin | sed -e s/.*origin\\/// -e s/[^a-zA-Z].*//"
+ COMMAND git rev-parse --symbolic-full-name --abbrev-ref HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE)
--
GitLab
From 7a7f7e09def5748baf59690b4ca15a79699eaa2c Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Thu, 28 Nov 2024 11:37:10 +0000
Subject: [PATCH 5/5] Build update
---
CMakeLists.txt | 58 +++++++++++++++++++++++++-------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4db039f..e88eef6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ project(Tadah.MLIP)
get_filename_component(MODULE_TEST ${CMAKE_BINARY_DIR} NAME)
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}
OR ${MODULE_TEST} STREQUAL "MLIP"
- )
- message(FATAL_ERROR "
+)
+ message(FATAL_ERROR "
In-source builds not allowed.
Please make a new directory (called a build directory) and run CMake from there.
You may need to remove CMakeCache.txt and CMakeFiles dir. ")
@@ -19,39 +19,39 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
if(BUILD_SHARED_LIBS)
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
if (BUILD_SHARED_LIBS)
- # Always full RPATH
- # use, i.e. don't skip the full RPATH for the build tree
- set(CMAKE_SKIP_BUILD_RPATH FALSE)
+ # Always full RPATH
+ # use, i.e. don't skip the full RPATH for the build tree
+ set(CMAKE_SKIP_BUILD_RPATH FALSE)
- # when building, don't use the install RPATH already
- # (but later on when installing)
- set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ # when building, don't use the install RPATH already
+ # (but later on when installing)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- # add the automatically determined parts of the RPATH
- # which point to directories outside the build tree to the install RPATH
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ # add the automatically determined parts of the RPATH
+ # which point to directories outside the build tree to the install RPATH
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- # the RPATH to be used when installing, but only if it's not a system directory
- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
- if("${isSystemDir}" STREQUAL "-1")
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- endif("${isSystemDir}" STREQUAL "-1")
+ # the RPATH to be used when installing, but only if it's not a system directory
+ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+ if("${isSystemDir}" STREQUAL "-1")
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ endif("${isSystemDir}" STREQUAL "-1")
endif()
include(FetchContent)
if(DEFINED ENV{CI_COMMIT_REF_NAME})
- set(GIT_BRANCH "$ENV{CI_COMMIT_REF_NAME}")
+ set(GIT_BRANCH "$ENV{CI_COMMIT_REF_NAME}")
elseif(DEFINED ENV{READTHEDOCS})
- set(GIT_BRANCH "$ENV{READTHEDOCS_PROJECT}")
+ set(GIT_BRANCH "$ENV{READTHEDOCS_VERSION}")
else()
- execute_process(
+ execute_process(
COMMAND git rev-parse --symbolic-full-name --abbrev-ref HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_BRANCH
@@ -63,7 +63,7 @@ FetchContent_Declare(
Tadah.MODELS
GIT_REPOSITORY https://git.ecdf.ed.ac.uk/tadah/models.git
GIT_TAG origin/${GIT_BRANCH}
- )
+)
FetchContent_MakeAvailable(Tadah.MODELS)
@@ -78,20 +78,20 @@ target_include_directories(tadah.mlip PUBLIC ${Tadah.CORE_SOURCE_DIR}/include)
target_include_directories(tadah.mlip PUBLIC ${Tadah.CORE_SOURCE_DIR}/external/toml11)
if(TADAH_ENABLE_OPENMP)
- find_package(OpenMP REQUIRED)
- target_link_libraries(tadah.mlip PUBLIC OpenMP::OpenMP_CXX)
+ find_package(OpenMP REQUIRED)
+ target_link_libraries(tadah.mlip PUBLIC OpenMP::OpenMP_CXX)
endif()
if (TADAH_BUILD_MPI)
- find_package(MPI REQUIRED)
- target_link_libraries(tadah.mlip PUBLIC MPI::MPI_CXX)
- add_compile_definitions(TADAH_BUILD_MPI)
+ find_package(MPI REQUIRED)
+ target_link_libraries(tadah.mlip PUBLIC MPI::MPI_CXX)
+ add_compile_definitions(TADAH_BUILD_MPI)
endif()
if(TADAH_BUILD_TESTS)
- include(CTest)
- add_subdirectory(tests)
+ include(CTest)
+ add_subdirectory(tests)
endif()
# Installation rules
--
GitLab