From 67546b22c952294b33d4866693aaefd1adbc30d8 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Wed, 29 Sep 2021 17:50:04 +0200
Subject: [PATCH 1/3] Fix PR #5853

This patch actually somehow revert #5853, and surrounds the two
`install` commands with `if(CGAL_BRANCH_BUILD)`.
---
 Installation/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index dd47c660132..09682cc0e08 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -660,6 +660,10 @@ cache_get(CGAL_3RD_PARTY_LIBRARIES     )
 cache_get(CGAL_3RD_PARTY_LIBRARIES_DIRS)
 
 install(DIRECTORY "${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/" DESTINATION "${CGAL_INSTALL_INC_DIR}/CGAL/Qt" COMPONENT CGAL_Qt5)
+if(CGAL_BRANCH_BUILD)
+  install(DIRECTORY "${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/demo/resources/" DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/resources" COMPONENT CGAL_Qt5)
+  install(DIRECTORY "${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/demo/icons/" DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/icons" COMPONENT CGAL_Qt5)
+endif()
 
 #
 # Variables used when WITH_{demos|examples|tests} are TRUE

From b8c7be97c97eecca9e389f8d33df35b1916d05f0 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Wed, 29 Sep 2021 18:01:53 +0200
Subject: [PATCH 2/3] Update the CI

---
 .github/workflows/cmake-all.yml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cmake-all.yml b/.github/workflows/cmake-all.yml
index e619a597cf3..bbf7077268e 100644
--- a/.github/workflows/cmake-all.yml
+++ b/.github/workflows/cmake-all.yml
@@ -1,9 +1,9 @@
-name: CMake all CGAL
+name: CMake Testsuite
 
 on: [push, pull_request]
 
 jobs:
-  build:
+  cmake-testsuite:
 
     runs-on: ubuntu-latest
     
@@ -12,4 +12,21 @@ jobs:
     - name: install dependencies
       run: sudo apt-get install -y libboost-dev libboost-program-options-dev libmpfr-dev libeigen3-dev
     - name: configure all
-      run: mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON ..
+      run: |
+        set -e
+        mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON ..
+        ctest -L CGAL_cmake_testsuite
+
+  cmake-testsuite-with-qt5:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2.0.0
+    - name: install dependencies
+      run: sudo bash -e .github/install.sh
+    - name: configure all
+      run: |
+        set -e
+        mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON ..
+        ctest -L CGAL_cmake_testsuite

From 349d1361612460b53b924ff028827650fcff7f27 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Wed, 29 Sep 2021 18:03:51 +0200
Subject: [PATCH 3/3] Add BUILD_TESTING, for CTest

---
 .github/workflows/cmake-all.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cmake-all.yml b/.github/workflows/cmake-all.yml
index bbf7077268e..5e2faa05026 100644
--- a/.github/workflows/cmake-all.yml
+++ b/.github/workflows/cmake-all.yml
@@ -14,7 +14,7 @@ jobs:
     - name: configure all
       run: |
         set -e
-        mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON ..
+        mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON -DBUILD_TESTING=ON ..
         ctest -L CGAL_cmake_testsuite
 
   cmake-testsuite-with-qt5:
@@ -28,5 +28,5 @@ jobs:
     - name: configure all
       run: |
         set -e
-        mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON ..
+        mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON -DBUILD_TESTING=ON ..
         ctest -L CGAL_cmake_testsuite