Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix macos build failure #15

Merged
merged 2 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jobs:
- os: windows-latest
compiler: msvc
- os: macos-latest
compiler: clang
compiler:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/vcpkg
Expand All @@ -52,6 +52,11 @@ jobs:
vcpkg: true
cppcheck: false

- name: Install compiler for Macos
if: startsWith(matrix.os, 'macos')
run: |
brew install llvm

- name: Prepare the PATH
run: |
if [[ "${{ runner.os }}" == "Windows" ]]; then
Expand Down
11 changes: 2 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
project(logfault
DESCRIPTION "Simple to use, header only C++ library for application-logging on all major platforms."
HOMEPAGE_URL https://github.com/jgaa/logfault
VERSION 0.5.1
VERSION 0.5.2
LANGUAGES CXX)

include(GNUInstallDirs)
Expand All @@ -12,16 +12,9 @@ set(LOGFAULT_ROOT ${CMAKE_CURRENT_SOURCE_DIR})

message(STATUS "Using ${CMAKE_CXX_COMPILER}")

macro(SET_CPP_STANDARD target)
message(STATUS "Using C++ 11 for ${target}")
set_property(TARGET ${target} PROPERTY CXX_STANDARD 11)
endmacro(SET_CPP_STANDARD)

find_package (Threads)
set(DEFAULT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
include_directories(
${PROJECT_SOURCE_DIR}/include
)
include_directories(${PROJECT_SOURCE_DIR}/include)

option(LOGFAULT_BUILD_TESTS "Build tests" ON)

Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class LogfaultConan(ConanFile):
name = "logfault"
version = "0.5.1"
version = "0.5.2"
settings = "os", "arch", "compiler", "build_type"
exports_sources = "include/*", "tests/*", "CMakeLists.txt"
no_copy_source = True
Expand Down
Loading