Skip to content

Commit

Permalink
Hotfix/repo name (#97)
Browse files Browse the repository at this point in the history
* bugfix for repo name in finding git tag

* jedicmake bugfix

* bugfix
  • Loading branch information
Mark Miesch authored Jun 15, 2021
1 parent dc56a40 commit 9683ef9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
4 changes: 2 additions & 2 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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}" )
Expand Down

0 comments on commit 9683ef9

Please sign in to comment.