Merge remote-tracking branch 'origin/master' into feat_dss (8a20b0f1) · Commits · Aerospace and Mechanical Engineering / amfe · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

amfe
- Activity
- Members
- Labels
- Wiki
- Environments
- Terraform modules

Snippets Groups Projects

8a20b0f1

Commit 8a20b0f1 authored 3 years ago by acrovato

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feat_dss

parents 46eb2e5f e4ae8749

Branches feat_amgcl

No related tags found

1 merge request!6amfe v1.0.5

Pipeline #5758 passed 3 years ago

Changes 15
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CMake/FindMPI4PY.cmake 0 additions, 42 deletions

CMake/FindMPI4PY.cmake
CMake/codeblocks.cmake 0 additions, 20 deletions

CMake/codeblocks.cmake
CMake/debian-intel.cmake 0 additions, 21 deletions

CMake/debian-intel.cmake
CMake/debian.cmake 0 additions, 20 deletions

CMake/debian.cmake
CMake/maclam.cmake 3 additions, 6 deletions

CMake/maclam.cmake
CMake/spring.cmake 0 additions, 24 deletions

CMake/spring.cmake
CMake/ubuntu.cmake 0 additions, 23 deletions

CMake/ubuntu.cmake
CMake/use-clang-compiler.cmake 0 additions, 5 deletions

CMake/use-clang-compiler.cmake
CMake/use-intel-compiler.cmake 2 additions, 3 deletions

CMake/use-intel-compiler.cmake
CMake/win64-libsVs2017Py3.cmake 4 additions, 11 deletions

CMake/win64-libsVs2017Py3.cmake
CMakeLists.txt 2 additions, 1 deletion

CMakeLists.txt
fwk/_src/CMakeLists.txt 2 additions, 1 deletion

fwk/_src/CMakeLists.txt
tbox/_src/CMakeLists.txt 2 additions, 1 deletion

tbox/_src/CMakeLists.txt
tbox/src/wLazy.h 1 addition, 1 deletion

tbox/src/wLazy.h
tboxVtk/_src/CMakeLists.txt 2 additions, 1 deletion

tboxVtk/_src/CMakeLists.txt

with 18 additions and 180 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment