From 9683ef97c6f42e3c21833c13b766b1e0cc997952 Mon Sep 17 00:00:00 2001 From: Mark Miesch Date: Tue, 15 Jun 2021 13:30:59 -0600 Subject: [PATCH] Hotfix/repo name (#97) * bugfix for repo name in finding git tag * jedicmake bugfix * bugfix --- CMakeLists.txt | 2 +- test/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ed472f4b..8b300076e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ include( ${PROJECT_NAME}_compiler_flags ) ## Dependencies # Required -find_package( jedicmake QUIET ) # Prefer find modules from jedi-cmake +find_package( jedicmake REQUIRED ) # Prefer find modules from jedi-cmake find_package( OpenMP REQUIRED COMPONENTS Fortran ) find_package( MPI REQUIRED COMPONENTS Fortran ) find_package( NetCDF REQUIRED COMPONENTS Fortran ) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ba55ba184..14c79c43e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,7 +4,7 @@ # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. # use find_branch functionn in jedi-cmake -include( ${CMAKE_SOURCE_DIR}/jedicmake/cmake/Functions/git_functions.cmake ) +include( git_functions ) # Default SABER_TEST_TIER set( SABER_TEST_TIER 1 ) @@ -191,7 +191,7 @@ if ( DEFINED ENV{SABER_TESTFILES_BRANCH} ) set( GIT_BRANCH_SABER $ENV{SABER_TESTFILES_BRANCH} ) message( STATUS "Branch name provided by user: ${GIT_BRANCH_SABER}" ) else() - find_branch_name(REPO_DIR_NAME ${repo}) + find_branch_name(REPO_DIR_NAME saber) if( DEFINED GIT_TAG_FUNC ) set( GIT_BRANCH_SABER ${GIT_TAG_FUNC} ) # Tag is checked out message( STATUS "SABER is in tag: ${GIT_BRANCH_SABER}" )