Install ninja build tool on CI

ClausKlein · Dec 1, 2024 · 6e2b30a · 6e2b30a
1 parent 3d0fdf5
commit 6e2b30a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -50,7 +50,7 @@ jobs:
 
       - name: Install LCov
         run: sudo apt-get update -q
-          && sudo apt-get install lcov -q -y
+          && sudo apt-get install ninja-build lcov -q -y
 
       - name: Configure
         working-directory: asio
@@ -115,10 +115,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Setup ninja build toolchain
+        uses: aminya/setup-cpp@v1
+        with:
+          ninja: true
+
       - name: Install static analyzers
         if: matrix.os == 'ubuntu-24.04'
         run: |
-          sudo apt-get install cppcheck ninja-build -y -q
+          # Not used! sudo apt-get install cppcheck -y -q
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 19 all
@@ -198,7 +203,7 @@ jobs:
         with: {python-version: "3.12"}
 
       - name: Install m.css dependencies
-        run: pip3 install jinja2 Pygments
+        run: pip3 install ninja jinja2 Pygments
 
       - name: Install Doxygen
         run: sudo apt-get update -q

diff --git a/asio/.cmakefiles.txt b/asio/.cmakefiles.txt
@@ -3,6 +3,7 @@
 # git ls-files '::*.md' '::*.cmake' '::*CMakeLists.txt' '::*.json' '::*.cmake.in'
 #
 files='
+../.github/workflows/cmake.yml
 .CMakeUserPresets.json
 .TODO.txt
 .clang-format

diff --git a/asio/CMakeLists.txt b/asio/CMakeLists.txt
@@ -95,6 +95,7 @@ endif()
 # ---- Install rules ----
 
 if(NOT CMAKE_SKIP_INSTALL_RULES)
+  include(cmake/AddUninstallTarget.cmake)
   include(cmake/install-rules.cmake)
   configure_file(asio.pc.cmake asio.pc)
   install(FILES ${PROJECT_BINARY_DIR}/asio.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)