Skip to content

Commit

Permalink
again
Browse files Browse the repository at this point in the history
  • Loading branch information
andiwand committed Dec 26, 2023
1 parent 340d891 commit 2ae1dbb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 21 deletions.
19 changes: 5 additions & 14 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- { os: ubuntu-22.04, compiler: clang, cc: clang-15, cxx: clang++-15 }
- { os: ubuntu-22.04, compiler: gcc, cc: gcc-13, cxx: g++-13 }
- { os: macos-12, compiler: clang, cc: clang, cxx: clang++ }
- { os: windows-2022, compiler: msvc }
- { os: windows-2019, compiler: msvc }

steps:
- name: ubuntu install ccache
Expand Down Expand Up @@ -62,22 +62,13 @@ jobs:
- name: checkout
uses: actions/checkout@v2

- name: cmake unix
if: ${{ !startsWith(matrix.config.os, 'windows') }}
- name: cmake
env:
CC: ${{ matrix.config.cc }}
CXX: ${{ matrix.config.cxx }}
run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
- name: cmake windows
if: startsWith(matrix.config.os, 'windows')
run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Debug

- name: build unix
if: ${{ !startsWith(matrix.config.os, 'windows') }}
run: cmake --build build
- name: build windows
if: startsWith(matrix.config.os, 'windows')
run: cmake --build build --config Debug
run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
- name: build
run: cmake --build build --config Release # `config Release` somehow necessary for windows

- name: upload binaries
uses: actions/upload-artifact@v2
Expand Down
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
endif ()

# use ccache if available
find_program(CCACHE_FOUND ccache)
if (CCACHE_FOUND)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_FOUND}")
message(STATUS "using ccache ${CCACHE_FOUND}")
endif (CCACHE_FOUND)

if (NOT DEFINED CONAN_EXPORTED)
include("cmake/conan.cmake")
conan_cmake_configure(GENERATORS cmake)
Expand Down

0 comments on commit 2ae1dbb

Please sign in to comment.