vmatare/thinkfan
1
1
Fork 0
mirror of https://github.com/vmatare/thinkfan.git synced 2024-09-11 19:47:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into lm-sensors

Browse Source
This commit is contained in:
Victor Mataré 2022-02-05 20:37:06 +01:00
commit 4e784d0d07
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -1,6 +1,8 @@
project(thinkfan)
include(GNUInstallDirs)
set(THINKFAN_VERSION 1.4.0)
cmake_minimum_required(VERSION 3.0)
# Generate absolute paths or something
@ -86,7 +88,7 @@ add_executable(thinkfan ${SRC_FILES})
if (PID_FILE)
target_compile_definitions(thinkfan PRIVATE -DPID_FILE=\"${PID_FILE}\")
endif()
target_compile_definitions(thinkfan PRIVATE -DVERSION="1.4.0")
target_compile_definitions(thinkfan PRIVATE -DVERSION="${THINKFAN_VERSION}")
# std::condition_variable::wait_for doesn't block if not explicitly linked against libpthread
# https://stackoverflow.com/questions/41394670/c-condition-variable-wait-for-returns-instantly
@ -140,12 +142,15 @@ if(DISABLE_EXCEPTION_CATCHING)
target_compile_definitions(thinkfan PRIVATE -DDISABLE_EXCEPTION_CATCHING)
endif(DISABLE_EXCEPTION_CATCHING)
configure_file(src/thinkfan.1.cmake thinkfan.1)
configure_file(src/thinkfan.conf.5.cmake thinkfan.conf.5)
configure_file(src/thinkfan.conf.legacy.5.cmake thinkfan.conf.legacy.5)
install(TARGETS thinkfan DESTINATION "${CMAKE_INSTALL_SBINDIR}")
install(FILES COPYING README.md examples/thinkfan.yaml DESTINATION "${CMAKE_INSTALL_DOCDIR}")
install(FILES src/thinkfan.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
install(FILES src/thinkfan.conf.5 DESTINATION "${CMAKE_INSTALL_MANDIR}/man5")
install(FILES src/thinkfan.conf.legacy.5 DESTINATION "${CMAKE_INSTALL_MANDIR}/man5")
install(FILES ${CMAKE_BINARY_DIR}/thinkfan.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
install(FILES ${CMAKE_BINARY_DIR}/thinkfan.conf.5 DESTINATION "${CMAKE_INSTALL_MANDIR}/man5")
install(FILES ${CMAKE_BINARY_DIR}/thinkfan.conf.legacy.5 DESTINATION "${CMAKE_INSTALL_MANDIR}/man5")
if(SYSTEMD_FOUND)
configure_file(rcscripts/systemd/thinkfan.service.cmake

2
rcscripts/systemd/thinkfan.service.cmake
View File

@ -1,5 +1,5 @@
[Unit]
Description=Thinkfan, the minimalist fan control program
Description=thinkfan @THINKFAN_VERSION@
After=sysinit.target
After=systemd-modules-load.service

2
src/thinkfan.1 → src/thinkfan.1.cmake
View File

@ -1,4 +1,4 @@
.TH THINKFAN "1" "April 2020" "thinkfan 1.2" "thinkfan"
.TH THINKFAN "5" "December 2021" "thinkfan @THINKFAN_VERSION@" "thinkfan"
.SH NAME
thinkfan \- A simple fan control program
.SH SYNOPSIS

2
src/thinkfan.conf.5 → src/thinkfan.conf.5.cmake
View File

@ -1,4 +1,4 @@
.TH THINKFAN.CONF 5 "April 2020" "thinkfan 1.2"
.TH THINKFAN.CONF 5 "December 2021" "thinkfan @THINKFAN_VERSION@"
.SH NAME
thinkfan.conf \- YAML-formatted config for
.BR thinkfan (1)

2
src/thinkfan.conf.legacy.5 → src/thinkfan.conf.legacy.5.cmake
View File

@ -1,4 +1,4 @@
.TH THINKFAN.CONF.LEGACY 5 2020-04-09 "thinkfan 1.2"
.TH THINKFAN.CONF.LEGACY 5 2020-04-09 "thinkfan @THINKFAN_VERSION@"
.SH NAME
thinkfan.conf.legacy \- the old, backwards-compatible config syntax for
thinkfan