Test CI

andre-schulz · Jul 31, 2024 · caaf91c · caaf91c
1 parent f049253
commit caaf91c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: MVE GitHub Actions CI
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "gh_ci_test" ]
   pull_request:
     branches: [ "master" ]
 
@@ -61,6 +61,8 @@ jobs:
 
     - name: Build MVE on Linux/macOS
       run: |
+        uname -a
+        ${CXX} --version
         if [ "`uname`" = "Darwin"  ]; then
           export NUM_CPU_CORES="`sysctl -n hw.ncpu`"
         else

diff --git a/Makefile.inc b/Makefile.inc
@@ -14,7 +14,6 @@ CXXFLAGS += -pthread
 UNAME = $(shell uname)
 ifeq (${UNAME},Darwin)
     CXXFLAGS += -DGL_SILENCE_DEPRECATION=1
-    OPENMP =
 endif
 
 LIBJPEG_CFLAGS = `pkg-config --cflags libjpeg`