diff --git a/.github/workflows/cmake-all.yml b/.github/workflows/cmake-all.yml index e619a597cf3..5e2faa05026 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 -DBUILD_TESTING=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 -DBUILD_TESTING=ON .. + ctest -L CGAL_cmake_testsuite diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 43d3cbadc95..e050c6b9c2b 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -653,6 +653,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