Skip to content

Commit

Permalink
Merge pull request #408 from Leonard-Reuter/fix/submodules
Browse files Browse the repository at this point in the history
Fix cmake build_submodule for old git versions
  • Loading branch information
mathomp4 authored Jan 23, 2023
2 parents 08e21f7 + ab137a8 commit 7e986ac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Fixed build_submodule for old git versions
- Fixed for use with FetchContent
- Fix CMake logic in `add_pfunit_ctest.cmake` for `MPIEXEC_EXECUTABLE`. Problem not exposed by common MPI flavors which use `mpirun`
- Fix GitHub CI workflow by pinning to CMake 3.24.3
Expand Down
2 changes: 1 addition & 1 deletion cmake/build_submodule.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ macro (build_submodule submodule)
if (GIT_SUBMODULE)
execute_process (
COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
RESULT_VARIABLE GIT_SUBMODULE_RESULT
)
if (NOT GIT_SUBMODULE_RESULT EQUAL "0")
Expand Down

0 comments on commit 7e986ac

Please sign in to comment.