From 6ded81d2fbcddf91248eb6be9969240c702a82cf Mon Sep 17 00:00:00 2001 From: Maxim Radugin Date: Sun, 14 Jul 2024 15:47:43 +0300 Subject: [PATCH] try wo ccache --- .github/workflows/cmake-multi-platform.yml | 14 +++++++------- Findccache.cmake | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 0c76e28..a20bd6f 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -17,13 +17,13 @@ jobs: matrix: sys: - - { os: windows-latest, shell: 'msys2 {0}', generator: Ninja } + - { os: windows-latest, shell: 'msys2 {0}', generator: Ninja } - { os: windows-latest, shell: 'msys2 {0}', generator: Unix Makefiles } - - { os: ubuntu-latest, shell: bash, generator: Ninja } + - { os: ubuntu-latest, shell: bash, generator: Ninja } - { os: ubuntu-latest, shell: bash, generator: Unix Makefiles } - - { os: macos-latest, shell: bash, generator: Ninja } + - { os: macos-latest, shell: bash, generator: Ninja } - { os: macos-latest, shell: bash, generator: Unix Makefiles } compiler: @@ -32,10 +32,10 @@ jobs: build_type: [Debug] include: - - sys: { os: windows-latest, shell: bash, generator: Visual Studio 17 2022 } - compiler: { c: cl, cpp: cl } + - sys: { os: windows-latest, shell: bash, generator: Visual Studio 17 2022 } + compiler: { c: cl, cpp: cl } build_type: Debug - - sys: { os: macos-latest, shell: bash, generator: Xcode } + - sys: { os: macos-latest, shell: bash, generator: Xcode } compiler: { c: clang, cpp: clang++ } build_type: Debug @@ -93,7 +93,7 @@ jobs: run: | cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler.cpp }} -DCMAKE_C_COMPILER=${{ matrix.compiler.c }} -S "${{ steps.strings.outputs.source-dir }}" -B "${{ steps.strings.outputs.build-output-dir }}" -G "${{matrix.sys.generator}}" - - name: Build (no cache) + - name: Build (empty cache) # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). run: | cmake --build "${{ steps.strings.outputs.build-output-dir }}" --config ${{ matrix.build_type }} --verbose diff --git a/Findccache.cmake b/Findccache.cmake index 88a33d4..8a9b3bb 100644 --- a/Findccache.cmake +++ b/Findccache.cmake @@ -100,8 +100,8 @@ if (CCACHE_FOUND) ) elseif(CMAKE_GENERATOR MATCHES "Ninja" OR CMAKE_GENERATOR MATCHES "Unix Makefiles") # Support Unix Makefiles and Ninja - set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}") - set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}") + #set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}") + #set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}") else() message(WARNING "Unsupported generator for compiler cache: ${CMAKE_GENERATOR}") set(CCACHE_SUPPORTED NO)