Skip to content
Snippets Groups Projects
Commit 2d54ef6b authored by mkirsz's avatar mkirsz
Browse files

Build update

parent 18416266
No related branches found
No related tags found
1 merge request!8Develop
Pipeline #48643 failed
...@@ -93,27 +93,25 @@ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING ...@@ -93,27 +93,25 @@ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
include(FetchContent) include(FetchContent)
message(STATUS "${TADAH}.LAMMPS Obtaining branch name...")
if(DEFINED ENV{CI_COMMIT_REF_NAME}) 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}")
else() else()
execute_process( execute_process(
#COMMAND git rev-parse --symbolic-full-name --abbrev-ref HEAD 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} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_BRANCH OUTPUT_VARIABLE GIT_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
endif() endif()
message(STATUS "${TADAH}.LAMMPS Using GIT_BRANCH: ${GIT_BRANCH}.") message(STATUS "${TADAH}.LAMMPS Using GIT_BRANCH: ${GIT_BRANCH}.")
message(STATUS "${TADAH}.LAMMPS Fetching MD.")
FetchContent_Declare( FetchContent_Declare(
Tadah.MD Tadah.MD
GIT_REPOSITORY https://git.ecdf.ed.ac.uk/tadah/md.git GIT_REPOSITORY https://git.ecdf.ed.ac.uk/tadah/md.git
GIT_TAG origin/${GIT_BRANCH} GIT_TAG origin/${GIT_BRANCH}
) )
FetchContent_MakeAvailable(Tadah.MD) FetchContent_MakeAvailable(Tadah.MD)
message(STATUS "${TADAH}.LAMMPS Fetching done.")
add_library(tadah.lammps STATIC lammps_tadah.cpp) add_library(tadah.lammps STATIC lammps_tadah.cpp)
target_link_libraries(tadah.lammps PUBLIC tadah.md) target_link_libraries(tadah.lammps PUBLIC tadah.md)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment