[CMake] Enable use of CMake in github actions .yml (continued from #342…

…) (#425)
libocca · Dec 28, 2020 · 246d25d · 246d25d
1 parent 6c98e86
commit 246d25d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,6 +21,15 @@ jobs:
             OCCA_COVERAGE: 1
             OCCA_FORTRAN_ENABLED: 1
 
+          - name: (Ubuntu) CMake + gcc-8
+            os: ubuntu-18.04
+            CC: gcc-8
+            CXX: g++-8
+            CXXFLAGS: -Wno-maybe-uninitialized -Wno-cpp
+            GCOV: gcov-8
+            OCCA_COVERAGE: 1
+            useCMake: true
+
           - name: (Ubuntu) gcc-9
             os: ubuntu-18.04
             CC: gcc-9
@@ -79,18 +88,37 @@ jobs:
 
     - name: Compiler info
       run: make -j 16 info
+      if: ${{ !matrix.useCMake }}
+
+    - name: CMake build
+      run: |
+        cmake -E make_directory ${{runner.workspace}}/occa/build
+        cd ${{runner.workspace}}/occa/build
+        cmake -DENABLE_TESTS=On -DENABLE_EXAMPLES=On ${{runner.workspace}}/occa
+        make -j 16
+      if: ${{ matrix.useCMake }}
 
     - name: Compile library
       run: make -j 16
+      if: ${{ !matrix.useCMake }}
 
     - name: Compile tests
       run: make -j 16 tests
+      if: ${{ !matrix.useCMake }}
 
     - name: Run unit tests
       run: ./tests/run_tests
+      if: ${{ !matrix.useCMake }}
 
     - name: Run examples
       run: ./tests/run_examples
+      if: ${{ !matrix.useCMake }}
+
+    - name: Run CTests
+      run: |
+        cd ${{runner.workspace}}/occa/build
+        make test
+      if: ${{ matrix.useCMake }}
 
     - name: Upload code coverage
       run: bash <(curl --no-buffer -s https://codecov.io/bash) -x "${GCOV}"

diff --git a/cmake/SetCompilerFlags.cmake b/cmake/SetCompilerFlags.cmake
@@ -28,10 +28,10 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
   set(CMAKE_CXX_FLAGS_RELEASE "-O1 -DNDEBUG")
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SUPPORTED_WARN_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS "${SUPPORTED_WARN_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
 
 set_optional_cxx_flag(SUPPORTED_WERROR_CXX_FLAGS "-Werror")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${SUPPORTED_WERROR_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS_DEBUG "${SUPPORTED_WERROR_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
 
 include(CheckCCompilerFlag)
 
@@ -56,10 +56,10 @@ set_optional_c_flag(SUPPORTED_WARN_C_FLAGS "-Wno-c++11-long-long")
 set_optional_c_flag(SUPPORTED_WARN_C_FLAGS "-diag-disable 11074 -diag-disable 11076")   # Disable warnings about inline limits reached
 set_optional_c_flag(SUPPORTED_WARN_C_FLAGS "--display_error_number")  # Show PGI error numbers
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SUPPORTED_WARN_C_FLAGS}")
+set(CMAKE_C_FLAGS "${SUPPORTED_WARN_C_FLAGS} ${CMAKE_C_FLAGS}")
 
 set_optional_c_flag(SUPPORTED_WERROR_C_FLAGS "-Werror")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${SUPPORTED_WERROR_C_FLAGS}")
+set(CMAKE_C_FLAGS_DEBUG "${SUPPORTED_WERROR_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}")
 
 if (ENABLE_FORTRAN)
   include(CheckFortranCompilerFlag)