From 8d6218a0ed63e10da90399c65b93dd4eebf4bde3 Mon Sep 17 00:00:00 2001 From: Elias Kosunen Date: Thu, 18 Jan 2024 23:01:47 +0200 Subject: [PATCH] Small CMake adjustments --- .github/workflows/arch.yml | 18 ++++---- .github/workflows/coverage.yml | 10 ++--- .github/workflows/linux.yml | 82 +++++++++++++++++----------------- .github/workflows/lite.yml | 26 +++++------ .github/workflows/macos.yml | 10 ++--- .github/workflows/windows.yml | 26 +++++------ CMakeLists.txt | 6 +-- cmake/install.cmake | 5 ++- 8 files changed, 92 insertions(+), 91 deletions(-) diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml index 3ef6db70..e2de478f 100644 --- a/.github/workflows/arch.yml +++ b/.github/workflows/arch.yml @@ -33,7 +33,7 @@ env: CCACHE_ABSSTDERR: true CCACHE_COMPRESS: true CCACHE_COMPRESSLEVEL: 6 - CCACHE_MAXSIZE: 100M + CCACHE_MAXSIZE: 50M CCACHE_NOHASHDIR: true CCACHE_SLOPPINESS: "pch_defines,time_macros" CCACHE_UNIFY: true @@ -69,11 +69,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-${{ matrix.distro }}-${{ matrix.arch }}-${{ github.sha }} + key: ccache-arch-${{ matrix.distro }}-${{ matrix.arch }}-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-${{ matrix.distro }}-${{ matrix.arch }}-${{ github.ref }} - ${{ github.workflow }}-${{ matrix.distro }}-${{ matrix.arch }}-${{ github.base_ref }} - ${{ github.workflow }}-${{ matrix.distro }}-${{ matrix.arch }} + ccache-arch-${{ matrix.distro }}-${{ matrix.arch }}-${{ github.ref }} + ccache-arch-${{ matrix.distro }}-${{ matrix.arch }}-${{ github.base_ref }} + ccache-arch-${{ matrix.distro }}-${{ matrix.arch }} - uses: uraimo/run-on-arch-action@v2 name: Build and test @@ -143,11 +143,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: Windows-win2022-msvc${{ matrix.arch }}-std17-${{ github.sha }} + key: ccache-Windows-win2022-msvc${{ matrix.arch }}-std17-${{ github.sha }} restore-keys: | - Windows-win2022-msvc${{ matrix.arch }}-std17-${{ github.ref }} - Windows-win2022-msvc${{ matrix.arch }}-std17-${{ github.base_ref }} - Windows-win2022-msvc${{ matrix.arch }}-std17 + ccache-Windows-win2022-msvc${{ matrix.arch }}-std17-${{ github.ref }} + ccache-Windows-win2022-msvc${{ matrix.arch }}-std17-${{ github.base_ref }} + ccache-Windows-win2022-msvc${{ matrix.arch }}-std17 - name: Run CMake working-directory: ${{ runner.workspace }}/build diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 60ab4edc..bb88f135 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -34,7 +34,7 @@ env: CCACHE_COMPRESS: true CCACHE_COMPRESSLEVEL: 6 CCACHE_DIR: "/tmp/ccache" - CCACHE_MAXSIZE: 100M + CCACHE_MAXSIZE: 50M CCACHE_NOHASHDIR: true CCACHE_SLOPPINESS: "pch_defines,time_macros" CCACHE_UNIFY: true @@ -70,11 +70,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: coverage-${{ github.sha }} + key: ccache-coverage-${{ github.sha }} restore-keys: | - coverage-${{ github.ref }} - coverage-${{ github.base_ref }} - coverage + ccache-coverage-${{ github.ref }} + ccache-coverage-${{ github.base_ref }} + ccache-coverage - name: Setup ccache run: | diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1284d9c6..2e0155b8 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -42,7 +42,7 @@ env: CCACHE_COMPRESS: true CCACHE_COMPRESSLEVEL: 6 CCACHE_DIR: "/tmp/ccache" - CCACHE_MAXSIZE: 100M + CCACHE_MAXSIZE: 50M CCACHE_NOHASHDIR: true CCACHE_SLOPPINESS: "pch_defines,time_macros" CCACHE_UNIFY: true @@ -237,11 +237,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.sha }} + key: ccache-${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.ref }} - ${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.base_ref }} - ${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }} + ccache-${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.ref }} + ccache-${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }} - name: Setup ccache run: | @@ -309,11 +309,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ env.CXX }}-std${{ matrix.std }}-libcxx-${{ github.sha }} + key: ccache-${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ env.CXX }}-std${{ matrix.std }}-libcxx-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ env.CXX }}-std${{ matrix.std }}-libcxx-${{ github.ref }} - ${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ env.CXX }}-std${{ matrix.std }}-libcxx-${{ github.base_ref }} - ${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ env.CXX }}-std${{ matrix.std }}-libcxx + ccache-${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ env.CXX }}-std${{ matrix.std }}-libcxx-${{ github.ref }} + ccache-${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ env.CXX }}-std${{ matrix.std }}-libcxx-${{ github.base_ref }} + ccache-${{ github.workflow }}-ubuntu${{ matrix.os }}-${{ env.CXX }}-std${{ matrix.std }}-libcxx - name: Setup ccache run: | @@ -353,11 +353,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-alpine-${{ github.sha }} + key: ccache-${{ github.workflow }}-alpine-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-alpine-${{ github.ref }} - ${{ github.workflow }}-alpine-${{ github.base_ref }} - ${{ github.workflow }}-alpine + ccache-${{ github.workflow }}-alpine-${{ github.ref }} + ccache-${{ github.workflow }}-alpine-${{ github.base_ref }} + ccache-${{ github.workflow }}-alpine - name: Start docker run: | @@ -441,11 +441,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ matrix.std }}-sanitize-${{ github.sha }} + key: ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ matrix.std }}-sanitize-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ matrix.std }}-sanitize-${{ github.ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ matrix.std }}-sanitize-${{ github.base_ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ matrix.std }}-sanitize + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ matrix.std }}-sanitize-${{ github.ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ matrix.std }}-sanitize-${{ github.base_ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ matrix.std }}-sanitize - name: Setup ccache run: | @@ -504,15 +504,15 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }}-${{ github.sha }} + key: ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }}-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }}-${{ github.ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }}-${{ github.base_ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.sha }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.base_ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }}-${{ github.ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.sha }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }} - name: Setup ccache run: | @@ -612,15 +612,15 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.sha }} + key: ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.base_ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.sha }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.base_ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.sha }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }} - name: Setup ccache run: | @@ -710,15 +710,15 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-regex${{ matrix.engine }}-icu${{ matrix.icu }}-${{ github.sha }} + key: ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-regex${{ matrix.engine }}-icu${{ matrix.icu }}-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-regex${{ matrix.engine }}-icu${{ matrix.icu }}-${{ github.ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-regex${{ matrix.engine }}-icu${{ matrix.icu }}-${{ github.base_ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-regex${{ matrix.engine }}-icu${{ matrix.icu }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.sha }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.base_ref }} - ${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-regex${{ matrix.engine }}-icu${{ matrix.icu }}-${{ github.ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-regex${{ matrix.engine }}-icu${{ matrix.icu }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-regex${{ matrix.engine }}-icu${{ matrix.icu }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.sha }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }} - name: Setup ccache run: | diff --git a/.github/workflows/lite.yml b/.github/workflows/lite.yml index e19bb66e..4a766d5e 100644 --- a/.github/workflows/lite.yml +++ b/.github/workflows/lite.yml @@ -42,7 +42,7 @@ env: CCACHE_COMPRESS: true CCACHE_COMPRESSLEVEL: 6 CCACHE_DIR: "/tmp/ccache" - CCACHE_MAXSIZE: 100M + CCACHE_MAXSIZE: 50M CCACHE_NOHASHDIR: true CCACHE_SLOPPINESS: "pch_defines,time_macros" CCACHE_UNIFY: true @@ -110,11 +110,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: Linux-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.sha }} + key: ccache-Linux-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.sha }} restore-keys: | - Linux-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.ref }} - Linux-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.base_ref }} - Linux-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }} + ccache-Linux-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.ref }} + ccache-Linux-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.base_ref }} + ccache-Linux-ubuntu${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }} - name: Setup ccache run: | @@ -168,11 +168,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: Windows-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.sha }} + key: ccache-Windows-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.sha }} restore-keys: | - Windows-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.ref }} - Windows-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.base_ref }} - Windows-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }} + ccache-Windows-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.ref }} + ccache-Windows-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.base_ref }} + ccache-Windows-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }} - name: Setup ccache run: | @@ -225,11 +225,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: macOS-macos12-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.sha }} + key: ccache-macOS-macos12-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.sha }} restore-keys: | - macOS-macos12-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.ref }} - macOS-macos12-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.base_ref }} - macOS-macos12-${{ matrix.cxx }}-std${{ matrix.std }} + ccache-macOS-macos12-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.ref }} + ccache-macOS-macos12-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.base_ref }} + ccache-macOS-macos12-${{ matrix.cxx }}-std${{ matrix.std }} - name: Setup ccache run: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f0520de5..34f925f7 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -38,7 +38,7 @@ env: CCACHE_COMPRESS: true CCACHE_COMPRESSLEVEL: 6 CCACHE_DIR: "/tmp/ccache" - CCACHE_MAXSIZE: 100M + CCACHE_MAXSIZE: 50M CCACHE_NOHASHDIR: true CCACHE_SLOPPINESS: "pch_defines,time_macros" CCACHE_UNIFY: true @@ -87,11 +87,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-macos${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.sha }} + key: ccache-${{ github.workflow }}-macos${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-macos${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.ref }} - ${{ github.workflow }}-macos${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.base_ref }} - ${{ github.workflow }}-macos${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }} + ccache-${{ github.workflow }}-macos${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.ref }} + ccache-${{ github.workflow }}-macos${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-macos${{ matrix.os }}-${{ matrix.cxx }}-std${{ matrix.std }} - name: Setup ccache run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a9d70585..0282cbaf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -37,7 +37,7 @@ env: CCACHE_COMPRESS: true CCACHE_COMPRESSLEVEL: 6 CCACHE_DIR: D:/ccache - CCACHE_MAXSIZE: 100M + CCACHE_MAXSIZE: 50M CCACHE_NOHASHDIR: true CCACHE_SLOPPINESS: "pch_defines,time_macros" CCACHE_UNIFY: true @@ -68,11 +68,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.sha }} + key: ccache-${{ github.workflow }}-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.ref }} - ${{ github.workflow }}-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.base_ref }} - ${{ github.workflow }}-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }} + ccache-${{ github.workflow }}-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.ref }} + ccache-${{ github.workflow }}-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-win${{ matrix.os }}-msvc${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }} - name: Setup ccache run: | @@ -124,11 +124,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-win${{ matrix.os }}-clangcl${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.sha }} + key: ccache-${{ github.workflow }}-win${{ matrix.os }}-clangcl${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-win${{ matrix.os }}-clangcl${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.ref }} - ${{ github.workflow }}-win${{ matrix.os }}-clangcl${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.base_ref }} - ${{ github.workflow }}-win${{ matrix.os }}-clangcl${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }} + ccache-${{ github.workflow }}-win${{ matrix.os }}-clangcl${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.ref }} + ccache-${{ github.workflow }}-win${{ matrix.os }}-clangcl${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-win${{ matrix.os }}-clangcl${{ matrix.platform }}-std${{ matrix.std }}-${{ matrix.type }} - name: Setup ccache run: | @@ -201,11 +201,11 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.workflow }}-win2022-msys-${{ matrix.sys }}-${{ github.sha }} + key: ccache-${{ github.workflow }}-win2022-msys-${{ matrix.sys }}-${{ github.sha }} restore-keys: | - ${{ github.workflow }}-win2022-msys-${{ matrix.sys }}-${{ github.ref }} - ${{ github.workflow }}-win2022-msys-${{ matrix.sys }}-${{ github.base_ref }} - ${{ github.workflow }}-win2022-msys-${{ matrix.sys }} + ccache-${{ github.workflow }}-win2022-msys-${{ matrix.sys }}-${{ github.ref }} + ccache-${{ github.workflow }}-win2022-msys-${{ matrix.sys }}-${{ github.base_ref }} + ccache-${{ github.workflow }}-win2022-msys-${{ matrix.sys }} - name: Setup ccache run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 47401e61..edc8bfcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,10 +124,10 @@ add_library(scn ) target_include_directories(scn PUBLIC - $ - $ + $ + $ PRIVATE - $ + $ ) target_link_libraries(scn PRIVATE simdutf::simdutf diff --git a/cmake/install.cmake b/cmake/install.cmake index 2c6bcde9..6c7d9be2 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -15,8 +15,9 @@ endif() install(TARGETS ${targets} EXPORT scn-targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT scnlib_Development )