From 3be72a5ed14551d264a5bdcc9128aa24637f1fcb Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Mon, 6 May 2024 18:52:42 +0300 Subject: [PATCH] Trying to fix build failure on macos --- .github/workflows/ci.yaml | 7 ++++++- CMakeLists.txt | 11 ++--------- conanfile.py | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5a647dd..94d7274 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,7 @@ jobs: - os: windows-latest compiler: msvc - os: macos-latest - compiler: clang + compiler: steps: - name: Checkout code @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 562c330..68586c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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) diff --git a/conanfile.py b/conanfile.py index 35d22b3..73d2f0d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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