From aa5a225c821df389dbe1ad5d6f42a7b7c8fc767c Mon Sep 17 00:00:00 2001 From: Jos Dehaes Date: Wed, 20 Dec 2023 20:47:46 +0100 Subject: [PATCH] fix cmake build --- .github/workflows/cmake-macos.yml | 1 + CMakeLists.txt | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-macos.yml b/.github/workflows/cmake-macos.yml index 32d6f7f..c2cb8c5 100644 --- a/.github/workflows/cmake-macos.yml +++ b/.github/workflows/cmake-macos.yml @@ -37,6 +37,7 @@ jobs: - name: Configure run: | export LLVM_PREFIX="$(brew --prefix llvm)" + export CC="$LLVM_PREFIX/bin/clang" export CXX="$LLVM_PREFIX/bin/clang++" export CPPFLAGS="-I$LLVM_PREFIX/include" export LDFLAGS="-L$LLVM_PREFIX/lib -L$LLVM_PREFIX/lib/c++ -Wl,-rpath,$LLVM_PREFIX/lib/c++ -fuse-ld=$LLVM_PREFIX/bin/ld64.lld" diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f8c546..0f9a475 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ project("btop" VERSION 1.2.13 DESCRIPTION "A monitor of resources" HOMEPAGE_URL "https://github.com/aristocratos/btop" - LANGUAGES CXX + LANGUAGES C CXX ) include(CheckCXXCompilerFlag) @@ -61,7 +61,7 @@ add_executable(btop ) if(APPLE) - target_sources(btop PRIVATE src/osx/btop_collect.cpp src/osx/sensors.cpp src/osx/smc.cpp) + target_sources(btop PRIVATE src/osx/btop_collect.cpp src/osx/sensors.cpp src/osx/smc.cpp src/osx/CpuFreq.c) elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") target_sources(btop PRIVATE src/freebsd/btop_collect.cpp) elseif(LINUX) @@ -165,6 +165,7 @@ endif() if(APPLE) target_link_libraries(btop $ $ + IOReport ) elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") # Avoid version mismatch for libstdc++ when a specific version of GCC is installed and not the