Finalize Build: Docs & Labels

wazedxwxx · Apr 4, 2020 · 14f0634 · 14f0634
1 parent 3a8c040
commit 14f0634
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -5,14 +5,14 @@ on: [push, pull_request]
 jobs:
   # Build and install libamrex as AMReX CMake project
   library:
+    name: GNU@7.5 C++17 [lib]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - name: Dependencies
       run: .github/workflows/cmake/dependencies.sh
     - name: Build & Install
       run: |
-        cmake --version
         mkdir build
         cd build
         cmake ..                                  \
@@ -23,29 +23,29 @@ jobs:
 
   # Build libamrex and all tutorials
   tutorials:
+    name: GNU@7.5 C++14 [tutorials]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - name: Dependencies
       run: .github/workflows/cmake/dependencies.sh
     - name: Build & Install
       run: |
-        cmake --version
         mkdir build
         cd build
         cmake .. -DENABLE_TUTORIALS=ON
         make -j 2
 
   # Build libamrex and all tutorials with CUDA
   tutorials-cuda:
+    name: CUDA@9.1.85 GNU@4.8.5 C++11 [tutorials]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - name: Dependencies
       run: .github/workflows/cmake/dependencies_nvcc.sh
     - name: Build & Install
       run: |
-        cmake --version
         mkdir build
         cd build
         cmake ..                                         \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,6 +50,9 @@ project( AMReX
     HOMEPAGE_URL "https://amrex-codes.github.io/amrex/"
     LANGUAGES C CXX Fortran
     )
+
+message(STATUS "CMake version: ${CMAKE_VERSION}")
+
 #
 # Load required modules
 #

diff --git a/Docs/sphinx_documentation/source/BuildingAMReX.rst b/Docs/sphinx_documentation/source/BuildingAMReX.rst
@@ -375,7 +375,7 @@ below.
    +------------------------------+-------------------------------------------------+-------------+-----------------+
    | CMAKE_CXX_FLAGS              |  User-defined C++ flags                         |             | user-defined    |
    +------------------------------+-------------------------------------------------+-------------+-----------------+
-   | AMREX_CXX_STANDARD           |  C++ standard                                   | 14          | 11, 14, 17      |
+   | CMAKE_CXX_STANDARD           |  C++ standard                                   | compiler/11 | 11, 14, 17, 20  |
    +------------------------------+-------------------------------------------------+-------------+-----------------+
    | DIM                          |  Dimension of AMReX build                       | 3           | 1, 2, 3         |
    +------------------------------+-------------------------------------------------+-------------+-----------------+