diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index adde7c9b5..5a990f162 100644 --- 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 index 9a7638b25..5fe8f5a7d 100644 --- 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`