Patch RPATH on FreeBSD, remove compiler flag on OSX and format

CMakeLists.txt

@@ -17,7 +17,12 @@ project("btop"
   LANGUAGES CXX
 )
 
-# Make custom modules available
+include(CheckCXXCompilerFlag)
+include(CheckIncludeFileCXX)
+include(CheckIPOSupported)
+include(CMakeDependentOption)
+
+# Make our Find<Package>.cmake files available
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 
 # When the build type is not set we can't fortify
@@ -31,8 +36,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_COLOR_DIAGNOSTICS ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-# Options
-include(CMakeDependentOption)
 option(BTOP_STATIC "Link btop statically" OFF)
 option(BTOP_LTO "Enable LTO" ON)
 option(BTOP_USE_MOLD "Use mold to link btop" OFF)
@@ -46,15 +49,6 @@ if(BTOP_STATIC)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
 endif()
 
-include(CheckCXXCompilerFlag)
-include(CheckIncludeFileCXX)
-include(CheckIPOSupported)
-
-check_include_file_cxx(ranges CXX_HAS_RANGES)
-if(NOT CXX_HAS_RANGES)
-  message(FATAL_ERROR "The compiler doesn't support <ranges>")
-endif()
-
 add_executable(btop
   src/btop.cpp
   src/btop_config.cpp
@@ -66,63 +60,56 @@ add_executable(btop
   src/btop_tools.cpp
 )
 
-# NOTE: Checks can be simplified with CMake 3.25
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  target_sources(btop PRIVATE
-    src/osx/btop_collect.cpp
-    src/osx/sensors.cpp
-    src/osx/smc.cpp
-  )
+if(APPLE)
+  target_sources(btop PRIVATE src/osx/btop_collect.cpp src/osx/sensors.cpp src/osx/smc.cpp)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
   target_sources(btop PRIVATE src/freebsd/btop_collect.cpp)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+elseif(LINUX)
   target_sources(btop PRIVATE src/linux/btop_collect.cpp)
 else()
   message(FATAL_ERROR "${CMAKE_SYSTEM_NAME} is not supported")
 endif()
 
+check_include_file_cxx(ranges CXX_HAS_RANGES)
+if(NOT CXX_HAS_RANGES)
+  message(FATAL_ERROR "The compiler doesn't support <ranges>")
+endif()
+
 # Check for and enable LTO
 check_ipo_supported(RESULT ipo_supported)
 if(ipo_supported AND BTOP_LTO)
   set_target_properties(btop PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
 endif()
 
-# TODO: enable more warnings in coordination with upstream
-target_compile_options(btop PRIVATE
-  -Wall -Wextra -Wpedantic
-  -ftree-vectorize -fstack-clash-protection
-)
+target_compile_options(btop PRIVATE -Wall -Wextra -Wpedantic -ftree-vectorize)
+
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  target_compile_options(btop PRIVATE
-    -Wheader-hygiene -Wgnu -Wthread-safety
-  )
+  target_compile_options(btop PRIVATE -Wheader-hygiene -Wgnu -Wthread-safety)
 endif()
-
 if(BTOP_PEDANTIC)
   target_compile_options(btop PRIVATE
-    -Wshadow -Wnon-virtual-dtor -Wold-style-cast -Wcast-align -Wunused
-    -Woverloaded-virtual -Wconversion -Wsign-conversion -Wdouble-promotion
-    -Wformat=2 -Wimplicit-fallthrough -Weffc++
+    -Wshadow -Wnon-virtual-dtor -Wold-style-cast -Wcast-align -Wunused -Woverloaded-virtual
+    -Wconversion -Wsign-conversion -Wdouble-promotion -Wformat=2 -Wimplicit-fallthrough -Weffc++
   )
   if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     target_compile_options(btop PRIVATE
-      -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wnull-dereference
-      -Wuseless-cast
+      -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wnull-dereference -Wuseless-cast
     )
   endif()
 endif()
-
 if(BTOP_WERROR)
   target_compile_options(btop PRIVATE -Werror)
 endif()
 
-check_cxx_compiler_flag(-fstack-protector CXX_HAS_FSTACK_PROTECTOR)
-if(CXX_HAS_FSTACK_PROTECTOR)
+if(NOT APPLE)
+  target_compile_options(btop PRIVATE -fstack-clash-protection)
+endif()
+check_cxx_compiler_flag(-fstack-protector HAS_FSTACK_PROTECTOR)
+if(HAS_FSTACK_PROTECTOR)
   target_compile_options(btop PRIVATE -fstack-protector)
 endif()
-
-check_cxx_compiler_flag(-fcf-protection CXX_HAS_FCF_PROTECTION)
-if(CXX_HAS_FCF_PROTECTION)
+check_cxx_compiler_flag(-fcf-protection HAS_FCF_PROTECTION)
+if(HAS_FCF_PROTECTION)
   target_compile_options(btop PRIVATE -fcf-protection)
 endif()
 
@@ -133,26 +120,33 @@ target_compile_definitions(btop PRIVATE
   $<$<NOT:$<CONFIG:Debug>>:_FORTIFY_SOURCE=2>
 )
 
+target_include_directories(btop SYSTEM PRIVATE include)
+
+# Enable pthreads
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+target_link_libraries(btop PRIVATE Threads::Threads)
+
 # Enable GPU support
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND BTOP_GPU)
   target_compile_definitions(btop PRIVATE GPU_SUPPORT)
 
   if(BTOP_RSMI_STATIC)
-    # ROCm doesn't properly add it's folders to the module path
-    # if `CMAKE_MODULE_PATH` is already set
+    # ROCm doesn't properly add it's folders to the module path if `CMAKE_MODULE_PATH` is already
+    # set
     # We could also manully append ROCm's path here
     set(_CMAKE_MODULE_PATH CMAKE_MODULE_PATH)
     unset(CMAKE_MODULE_PATH)
 
-    # NOTE: This might be problematic in the future if other sub projects
-    # depend on this or if btop starts producing libraries
+    # NOTE: This might be problematic in the future if other sub projects depend on this or if
+    # btop starts producing libraries
     # Build a static ROCm library
     set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 
     add_subdirectory(lib/rocm_smi_lib EXCLUDE_FROM_ALL)
 
     add_library(ROCm INTERFACE)
-    # Export ROCm's properties to a CMake target (which should've been done by ROCm :-/)
+    # Export ROCm's properties to a target
     target_compile_definitions(ROCm INTERFACE RSMI_STATIC)
     target_include_directories(ROCm INTERFACE lib/rocm_smi_lib/include)
     target_link_libraries(ROCm INTERFACE rocm_smi64)
@@ -163,9 +157,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND BTOP_GPU)
   endif()
 endif()
 
-target_include_directories(btop SYSTEM PRIVATE include)
-
-# mold
 if(BTOP_USE_MOLD)
   target_link_options(btop PRIVATE -fuse-ld=mold)
 endif()
@@ -175,15 +166,21 @@ if(BTOP_STATIC)
   target_link_options(btop PRIVATE -static LINKER:--fatal-warnings)
 endif()
 
-# Add libraries
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-target_link_libraries(btop PRIVATE Threads::Threads)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  target_link_libraries(btop PRIVATE $<LINK_LIBRARY:FRAMEWORK,CoreFoundation)
-  target_link_libraries(btop PRIVATE $<LINK_LIBRARY:FRAMEWORK,IOKit)
+# Other platform depdendent flags
+if(APPLE)
+  target_link_libraries(btop PRIVATE $<LINK_LIBRARY:FRAMEWORK,CoreFoundation>)
+  target_link_libraries(btop PRIVATE $<LINK_LIBRARY:FRAMEWORK,IOKit>)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+  # Avoid version mismatch for libstdc++ when a specific version of GCC is installed and not the
+  # default one since all use the default ones RPATH
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    string(REGEX MATCH "^[0-9]+" GCC_VERSION_MAJOR "${CMAKE_CXX_COMPILER_VERSION}")
+    set_target_properties(btop PROPERTIES
+      INSTALL_RPATH "/usr/local/lib/gcc${GCC_VERSION_MAJOR}"
+      BUILD_WITH_INSTALL_RPATH TRUE
+    )
+  endif()
+
   find_package(devstat REQUIRED)
   find_package(kvm REQUIRED)
   target_link_libraries(btop PRIVATE devstat::devstat kvm::kvm)