Add cxx standard tests

vlvovch · Sep 25, 2024 · 035b014 · 035b014
1 parent b48ba35
commit 035b014
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 17 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -35,30 +35,13 @@ jobs:
               - os: macos-latest
                 qts: 5.15.2
 
-    # env:
-    #   prefix: bin/examples/
-    #   suffix: ''
-
     steps:
     - uses: actions/checkout@v2
 
-    # - if: ${{ matrix.prefix }}
-    #   run: echo "prefix=${{ matrix.prefix }}" >> $GITHUB_ENV
-    # - if: ${{ matrix.prefix }}
-    #   run: echo "suffix=.exe" >> $GITHUB_ENV
-
-    # - name: Install Qt
-    #   uses: WillBrennan/yaqti
-    #   with:
-    #     version: '6.2.0'
-    #     host: 'linux'
-    #     target: 'desktop'
-    #     modules: 'qtcharts qtprintsupport'
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
         version: ${{ matrix.qts }}
-        # modules: 'qtprintsupport'
 
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
@@ -127,3 +110,85 @@ jobs:
       working-directory: ${{github.workspace}}/build
       shell: bash
       run: ${{ matrix.prefix }}PCE-Saha-LHC
+
+  cxx_standards:
+    runs-on: ubuntu-latest
+
+    strategy:
+        fail-fast: false
+        matrix:
+            cxxs: [11, 14, 17, 20, 23]
+
+    env:
+      prefix: bin/examples/
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Create Build Environment
+        # Some projects don't allow in-source building, so create a separate build directory
+        # We'll use this as our working directory for all subsequent commands
+        run: cmake -E make_directory ${{github.workspace}}/build
+
+      - name: Configure CMake
+        # Use a bash shell so we can use the same syntax for environment variable
+        # access regardless of the host operating system
+        shell: bash
+        working-directory: ${{github.workspace}}/build
+        # Note the current convention is to use the -S and -B options here to specify source 
+        # and build directories, but this is only available with CMake 3.13 and higher.  
+        # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_CXX_STANDARD=${{ matrix.cxxs }} -DINCLUDE_TESTS=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        # Execute the build.  You can specify a specific target with "--target <NAME>"
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Test
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        # Execute tests defined by the CMake configuration.  
+        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+        run: ctest -C $BUILD_TYPE
+
+      - name: CalculationTmu
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        run: ${prefix}CalculationTmu
+
+      - name: BagModelFit
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        run: ${prefix}BagModelFit 0.50 0.100 0.301 0.005
+
+      - name: cpc1HRGTDep0
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        run: ${prefix}cpc1HRGTDep 0
+
+      - name: cpc1HRGTDep1
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        run: ${prefix}cpc1HRGTDep 1
+
+      - name: cpc1HRGTDep2
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        run: ${prefix}cpc1HRGTDep 2
+
+      - name: cpc3chi2NEQ
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        run: ${prefix}cpc3chi2NEQ 0
+
+      - name: cpc4mcHRG
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        run: ${prefix}cpc4mcHRG$ 1 100
+
+      - name: PCE-Saha-LHC
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        run: ${prefix}PCE-Saha-LHC
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,12 @@ configure_file (
 
 # set(CMAKE_CXX_STANDARD 11 CACHE STRING "The C++ standard to use")
 # set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if (CMAKE_CXX_STANDARD)
+	message(STATUS "Using C++${CMAKE_CXX_STANDARD}")
+	SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+	SET(CXX_COMPILER_FLAGS_CHECKED TRUE)
+endif()
+
 if (NOT CXX_COMPILER_FLAGS_CHECKED)
 	include(CheckCXXCompilerFlag)
 	CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17)