mirror of https://github.com/aristocratos/btop.git
Merge branch 'main' into typo
This commit is contained in:
Ege Çetin
GitHub
commit
59af5d5a55
|
|
@ -41,6 +41,7 @@ option(BTOP_LTO "Enable LTO" ON)
|
|||
option(BTOP_USE_MOLD "Use mold to link btop" OFF)
|
||||
option(BTOP_PEDANTIC "Enable a bunch of additional warnings" OFF)
|
||||
option(BTOP_WERROR "Compile with warnings as errors" OFF)
|
||||
option(BTOP_FORTIFY "Detect buffer overflows with _FORTIFY_SOURCE=3" ON)
|
||||
option(BTOP_GPU "Enable GPU support" ON)
|
||||
cmake_dependent_option(BTOP_RSMI_STATIC "Link statically to ROCm SMI" OFF "BTOP_GPU" OFF)
|
||||
|
||||
|
|
@ -112,7 +113,7 @@ target_compile_definitions(btop PRIVATE
|
|||
_FILE_OFFSET_BITS=64
|
||||
$<$<CONFIG:Debug>:_GLIBCXX_ASSERTIONS _LIBCPP_ENABLE_ASSERTIONS=1>
|
||||
# Only has an effect with optimizations enabled
|
||||
$<$<NOT:$<CONFIG:Debug>>:_FORTIFY_SOURCE=2>
|
||||
$<$<AND:$<NOT:$<CONFIG:Debug>>,$<BOOL:${BTOP_FORTIFY}>>:_FORTIFY_SOURCE=3>
|
||||
)
|
||||
|
||||
target_include_directories(btop SYSTEM PRIVATE include)
|
||||
|
|
|
|||
7
Makefile
7
Makefile
|
|
@ -50,6 +50,11 @@ ifeq ($(GPU_SUPPORT),true)
|
|||
override ADDFLAGS += -DGPU_SUPPORT
|
||||
endif
|
||||
|
||||
FORTIFY_SOURCE ?= true
|
||||
ifeq ($(FORTIFY_SOURCE),true)
|
||||
override ADDFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
|
||||
endif
|
||||
|
||||
#? Compiler and Linker
|
||||
ifeq ($(shell $(CXX) --version | grep clang >/dev/null 2>&1; echo $$?),0)
|
||||
override CXX_IS_CLANG := true
|
||||
|
|
@ -174,7 +179,7 @@ override GOODFLAGS := $(foreach flag,$(TESTFLAGS),$(strip $(shell echo "int main
|
|||
override REQFLAGS := -std=c++20
|
||||
WARNFLAGS := -Wall -Wextra -pedantic
|
||||
OPTFLAGS := -O2 -ftree-vectorize -flto=$(LTO)
|
||||
LDCXXFLAGS := -pthread -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS -D_FILE_OFFSET_BITS=64 $(GOODFLAGS) $(ADDFLAGS)
|
||||
LDCXXFLAGS := -pthread -D_GLIBCXX_ASSERTIONS -D_FILE_OFFSET_BITS=64 $(GOODFLAGS) $(ADDFLAGS)
|
||||
override CXXFLAGS += $(REQFLAGS) $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS)
|
||||
override LDFLAGS += $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS)
|
||||
INC := $(foreach incdir,$(INCDIRS),-isystem $(incdir)) -I$(SRCDIR)
|
||||
|
|
|
|||
27
README.md
27
README.md
|
|
@ -47,8 +47,8 @@
|
|||
|
||||
Btop release v1.3.0
|
||||
|
||||
Big release with GPU support added for Linux and platform support for OpenBSD. Big thanks to @romner-set (GPU support) and @joske (OpenBSD support) for contributions.
|
||||
And a multitude of bugfixes and small changes, see [CHANGES.md](CHANGES.md) and latest [release](https://github.com/aristocratos/btop/releases/latest) for detailed list and attributions.
|
||||
Big release with GPU support added for Linux and platform support for OpenBSD. Big thanks to [@romner-set](https://github.com/romner-set) (GPU support) and [@joske](https://github.com/joske) (OpenBSD support) for contributions.
|
||||
And a multitude of bugfixes and small changes, see [CHANGELOG.md](CHANGELOG.md) and latest [release](https://github.com/aristocratos/btop/releases/latest) for detailed list and attributions.
|
||||
|
||||
See news entry below for more information regarding GPU support.
|
||||
|
||||
|
|
@ -222,6 +222,22 @@ Also needs a UTF8 locale and a font that covers:
|
|||
* Unicode Block “Geometric Shapes” U+25A0 - U+25FF
|
||||
* Unicode Block "Box Drawing" and "Block Elements" U+2500 - U+259F
|
||||
|
||||
### **Optional Dependencies (Needed for GPU monitoring)**
|
||||
|
||||
GPU monitoring also requires a btop binary built with GPU support (`GPU_SUPPORT=true` flag).
|
||||
|
||||
See [GPU compatibility](#gpu-compatibility) section for more about compiling with GPU support.
|
||||
|
||||
* **NVIDIA**
|
||||
|
||||
If you have an NVIDIA GPU you must use an official NVIDIA driver, both the closed-source and open-source ones have been verified to work.
|
||||
|
||||
In addition to that you must also have the nvidia-ml dynamic library installed, which should be included with the driver package of your distribution.
|
||||
|
||||
* **AMD**
|
||||
|
||||
If you have an AMD GPU `rocm_smi_lib` is required, which may or may not be packaged for your distribution.
|
||||
|
||||
### **Notice (Text rendering issues)**
|
||||
|
||||
* If you are having problems with the characters in the graphs not looking like they do in the screenshots, it's likely a problem with your systems configured fallback font not having support for braille characters.
|
||||
|
|
@ -405,6 +421,7 @@ Also needs a UTF8 locale and a font that covers:
|
|||
| `STRIP=true` | To force stripping of debug symbols (adds `-s` linker flag) |
|
||||
| `DEBUG=true` | Sets OPTFLAGS to `-O0 -g` and enables more verbose debug logging |
|
||||
| `ARCH=<architecture>` | To manually set the target architecture |
|
||||
| `FORTIFY_SOURCE=false` | Disable fortification with `_FORTIFY_SOURCE=3` |
|
||||
| `GPU_SUPPORT=<true\|false>` | Enable/disable GPU support (Enabled by default on X86_64 Linux) |
|
||||
| `RSMI_STATIC=true` | To statically link the ROCm SMI library used for querying AMDGPU |
|
||||
| `ADDFLAGS=<flags>` | For appending flags to both compiler and linker |
|
||||
|
|
@ -503,6 +520,7 @@ Also needs a UTF8 locale and a font that covers:
|
|||
| `-DBTOP_USE_MOLD=<ON\|OFF>` | Use mold to link btop (OFF by default) |
|
||||
| `-DBTOP_PEDANTIC=<ON\|OFF>` | Compile with additional warnings (OFF by default) |
|
||||
| `-DBTOP_WERROR=<ON\|OFF>` | Compile with warnings as errors (OFF by default) |
|
||||
| `-DBTOP_FORTIFY=<ON\|OFF>` | Detect buffer overflows with `_FORTIFY_SOURCE=3` (ON by default) |
|
||||
| `-DBTOP_GPU=<ON\|OFF>` | Enable GPU support (ON by default) |
|
||||
| `-DBTOP_RSMI_STATIC=<ON\|OFF>` | Build and link the ROCm SMI library statically (OFF by default) |
|
||||
| `-DCMAKE_INSTALL_PREFIX=<path>` | The installation prefix ('/usr/local' by default) |
|
||||
|
|
@ -576,6 +594,7 @@ Also needs a UTF8 locale and a font that covers:
|
|||
| `STRIP=true` | To force stripping of debug symbols (adds `-s` linker flag) |
|
||||
| `DEBUG=true` | Sets OPTFLAGS to `-O0 -g` and enables more verbose debug logging |
|
||||
| `ARCH=<architecture>` | To manually set the target architecture |
|
||||
| `FORTIFY_SOURCE=false` | Disable fortification with `_FORTIFY_SOURCE=3` |
|
||||
| `ADDFLAGS=<flags>` | For appending flags to both compiler and linker |
|
||||
| `CXX=<compiler>` | Manually set which compiler to use |
|
||||
|
||||
|
|
@ -674,6 +693,7 @@ Also needs a UTF8 locale and a font that covers:
|
|||
| `-DBTOP_USE_MOLD=<ON\|OFF>` | Use mold to link btop (OFF by default) |
|
||||
| `-DBTOP_PEDANTIC=<ON\|OFF>` | Compile with additional warnings (OFF by default) |
|
||||
| `-DBTOP_WERROR=<ON\|OFF>` | Compile with warnings as errors (OFF by default) |
|
||||
| `-DBTOP_FORTIFY=<ON\|OFF>` | Detect buffer overflows with `_FORTIFY_SOURCE=3` (ON by default) |
|
||||
| `-DCMAKE_INSTALL_PREFIX=<path>` | The installation prefix ('/usr/local' by default) |
|
||||
|
||||
To force any specific compiler, run `CXX=<compiler> cmake -B build -G Ninja`
|
||||
|
|
@ -742,6 +762,7 @@ Also needs a UTF8 locale and a font that covers:
|
|||
| `STRIP=true` | To force stripping of debug symbols (adds `-s` linker flag) |
|
||||
| `DEBUG=true` | Sets OPTFLAGS to `-O0 -g` and enables more verbose debug logging |
|
||||
| `ARCH=<architecture>` | To manually set the target architecture |
|
||||
| `FORTIFY_SOURCE=false` | Disable fortification with `_FORTIFY_SOURCE=3` |
|
||||
| `ADDFLAGS=<flags>` | For appending flags to both compiler and linker |
|
||||
| `CXX=<compiler>` | Manually set which compiler to use |
|
||||
|
||||
|
|
@ -851,6 +872,7 @@ Also needs a UTF8 locale and a font that covers:
|
|||
| `-DBTOP_USE_MOLD=<ON\|OFF>` | Use mold to link btop (OFF by default) |
|
||||
| `-DBTOP_PEDANTIC=<ON\|OFF>` | Compile with additional warnings (OFF by default) |
|
||||
| `-DBTOP_WERROR=<ON\|OFF>` | Compile with warnings as errors (OFF by default) |
|
||||
| `-DBTOP_FORTIFY=<ON\|OFF>` | Detect buffer overflows with `_FORTIFY_SOURCE=3` (ON by default) |
|
||||
| `-DCMAKE_INSTALL_PREFIX=<path>` | The installation prefix ('/usr/local' by default) |
|
||||
|
||||
_**Note:** Static linking does not work with GCC._
|
||||
|
|
@ -921,6 +943,7 @@ Also needs a UTF8 locale and a font that covers:
|
|||
| `STRIP=true` | To force stripping of debug symbols (adds `-s` linker flag) |
|
||||
| `DEBUG=true` | Sets OPTFLAGS to `-O0 -g` and enables more verbose debug logging |
|
||||
| `ARCH=<architecture>` | To manually set the target architecture |
|
||||
| `FORTIFY_SOURCE=false` | Disable fortification with `_FORTIFY_SOURCE=3` |
|
||||
| `ADDFLAGS=<flags>` | For appending flags to both compiler and linker |
|
||||
| `CXX=<compiler>` | Manually set which compiler to use |
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue