diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 974c796..fa8fef6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,14 +1,6 @@
 name: Build
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-  schedule:
-    - cron: "0 0 * * *"
+on: [ push, pull_request ]
 
 jobs:
   build:
@@ -22,26 +14,23 @@ jobs:
         scalar_double: ["OFF", "ON"]
         config:
           - {
-              name: "macOS Clang",
-              os: macos-latest,
+              name: "Windows MSVC",
+              os: windows-latest,
               generator: "Ninja",
+              conda_library_dir: "Library"
             }
           - {
-              name: "Ubuntu GCC",
-              os: ubuntu-latest,
-              generator: "Ninja",
+                name: "macOS Clang",
+                os: macos-latest,
+                generator: "Ninja",
+                conda_library_dir: "."
             }
-          - {
-              name: "Windows MSVC",
-              os: windows-latest,
-              generator: "Ninja",
-           }
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          submodules: true
+          submodules: recursive
 
       - name: Setup (Windows)
         if: matrix.config.os == 'windows-latest'
@@ -49,100 +38,128 @@ jobs:
         with:
           node-version: '16'
 
-      - name: Install Dependencies (macOS)
-        if: matrix.config.os == 'macos-latest'
-        run: |
-          #with cgal: brew install cgal ninja qt5 tbb
-          brew install ninja qt5 tbb
-
-          echo "Qt5_DIR=/usr/local/opt/qt5/lib/cmake/Qt5" >> $GITHUB_ENV
-
-      - name: Install Dependencies (Ubuntu)
-        if: matrix.config.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-
-          sudo apt-get install -y libcgal-dev libtbb-dev ninja-build qtbase5-dev
-
-      # DGM: caching conda doesn't seem to work properly anymore
-      #- name: Conda Cache (Windows)
-      #  if: matrix.config.os == 'windows-latest'
-      #  uses: actions/cache@v3
-      #  with:
-      #    path: C:\Miniconda3\envs\CCCoreLib
-      #    key: conda-cache-${{ runner.os }}-${{ hashFiles('.ci/conda.yml') }}
-
-      # DGM: without caching, using conda takes too long...
-      #- name: Install Dependencies (Windows)
-      #  if: matrix.config.os == 'windows-latest'
-      #  uses: conda-incubator/setup-miniconda@v2
-      #  with:
-      #    activate-environment: CCCoreLib
-      #    auto-activate-base: false
-      #    environment-file: .ci/conda.yml
-      #    channels: conda-forge
-      #    miniconda-version: 'latest'
-
-      # DGM: we'll just use Qt for now (and not CGAL)
-      - name: Install Qt
-        if:  matrix.config.os == 'windows-latest'
-        uses: jurplel/install-qt-action@v3
+      - name: Install Dependencies
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: CloudCompareDev
+          auto-activate-base: false
+          environment-file: .ci/conda.yml
+          miniconda-version: 'latest'
 
       - name: Configure MSVC console (Windows)
-        if:  matrix.config.os == 'windows-latest'
+        if: matrix.config.os == 'windows-latest'
         uses: ilammy/msvc-dev-cmd@v1
 
       - name: Set environment for MSVC (Windows)
-        if:  matrix.config.os == 'windows-latest'
+        if: matrix.config.os == 'windows-latest'
         run: |
           # Set these env vars so cmake picks the correct compiler
           # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
           echo "CXX=cl.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           echo "CC=cl.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
       - name: Configure (macOS)
         if: matrix.config.os == 'macos-latest'
-        run: >
-          mkdir cccorelib-build
-
-          cmake
-          -B cccorelib-build
-          -G "${{ matrix.config.generator }}"
-          -DCMAKE_BUILD_TYPE=Release
-          -DCCCORELIB_USE_CGAL=FALSE
-          -DCCCORELIB_USES_TBB=TRUE
-          -DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }}
-          .
+        shell: bash -l {0}
+        run: |
+          mkdir build
 
-      - name: Configure (Ubuntu)
-        if: matrix.config.os == 'ubuntu-latest'
-        run: >
-          mkdir cccorelib-build
-
-          cmake
-          -B cccorelib-build
-          -G "${{ matrix.config.generator }}"
-          -DCMAKE_BUILD_TYPE=Release
-          -DCCCORELIB_USE_CGAL=TRUE
-          -DCCCORELIB_USES_TBB=TRUE
-          -DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }}
+          export CONDA_LIB_DIR="$CONDA_PREFIX/${{ matrix.config.conda_library_dir }}"
+
+          cmake \
+          -B cccorelib-build \
+          -G "${{ matrix.config.generator }}" \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCCCORELIB_USE_CGAL=FALSE \
+          -DCCCORELIB_USES_TBB=TRUE \
+          -DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }} \
           .
 
+      # - name: Configure (Ubuntu)
+      #   if: matrix.config.os == 'ubuntu-latest'
+      #   run: >
+      #     mkdir cccorelib-build
+      # 
+      #     cmake
+      #     -B cccorelib-build
+      #     -G "${{ matrix.config.generator }}"
+      #     -DCMAKE_BUILD_TYPE=Release
+      #     -DCCCORELIB_USE_CGAL=TRUE
+      #     -DCCCORELIB_USES_TBB=TRUE
+      #     -DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }}
+      #     .
+
       - name: Configure (Windows)
         if:  matrix.config.os == 'windows-latest'
-        run: >
-          mkdir cccorelib-build
-
-          cmake
-          -B cccorelib-build
-          -G "${{ matrix.config.generator }}"
-          -DCMAKE_BUILD_TYPE=Release
-          # DGM: without caching, using conda takes tool long...
-          #-DCCCORELIB_USE_CGAL=TRUE
-          -DCCCORELIB_USE_CGAL=FALSE
-          -DCCCORELIB_USES_TBB=TRUE
-          -DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }}
+        shell: bash -l {0}
+        run: |
+          mkdir build
+
+          cmake \
+          -B cccorelib-build \
+          -G "${{ matrix.config.generator }}" \
+          -DCMAKE_BUILD_TYPE=Release \
+          # DGM: without caching, using conda takes too long...
+          #-DCCCORELIB_USE_CGAL=TRUE \
+          -DCCCORELIB_USE_CGAL=FALSE \
+          -DCCCORELIB_USES_TBB=TRUE \
+          -DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }} \
           .
 
       - name: Build
         run: |
-          cmake --build cccorelib-build
+          cmake --build cccorelib-build --parallel
+
+ubuntu-build:
+    name: Ubuntu ${{ matrix.compiler }} SCALAR_DOUBLE=${{ matrix.scalar_double }}
+    runs-on: ubuntu-20.04
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        scalar_double: [ "OFF", "ON" ]
+        compiler: ["GCC", "Clang"]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Install Dependencies
+        run: >
+          sudo apt-get update -qq
+
+          sudo apt-get install -qy cmake ninja-build
+          qt5-default qttools5-dev qttools5-dev-tools
+          libtbb-dev
+          libcgal-dev libcgal-qt5-dev
+
+      - name: Setup GCC
+        if: matrix.compiler == 'GCC'
+        run: |
+          echo "CC=gcc" >> $GITHUB_ENV
+          echo "CXX=g++" >> $GITHUB_ENV
+
+      - name: Setup Clang
+        if: matrix.compiler == 'Clang'
+        run: |
+          echo "CC=clang" >> $GITHUB_ENV
+          echo "CXX=clang++" >> $GITHUB_ENV
+
+      - name: Configure cmake
+        run: >
+          mkdir build
+
+          cmake \
+          -B cccorelib-build \
+          -G "${{ matrix.config.generator }}" \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCCCORELIB_USE_CGAL=TRUE \
+          -DCCCORELIB_USES_TBB=TRUE \
+          -DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }} \
+          .
+
+      - name: Build
+        run: cmake --build cccorelib-build --parallel