浏览代码

Merge branch 'master' of https://github.com/Maldela/fancontrol-gui

Maldela 9 年之前
父节点
当前提交
d78a6a4704
共有 2 个文件被更改,包括 23 次插入3 次删除
  1. 21 1
      README.md
  2. 2 2
      import/CMakeLists.txt

+ 21 - 1
README.md

@@ -1,5 +1,25 @@
 # fancontrol-gui
 GUI for Fancontrol. 
 It uses the KAuth module of the KDE Frameworks 5 to write the generated config file. 
-Furthermore it communicates with systemd via dbus to control the fancontrol service. 
+Furthermore it communicates with systemd via dbus to control the fancontrol service.
+
+KAuth currently doesn't support install prefixes other than where KAuth itself was installed.
+If you want to use another install prefix, you have to run the application as root or another user with the necessary privileges to avoid the KAuth helper.
+
 If you want to compile without systemd support set the option -DNO_SYSTEMD=true.
+
+To compile the additional KCM set the cmake option -DBUILD_KCM=on.
+The KCM is only build, if the -DNO_SYSTEMD option is unset or set to false.
+
+
+## Example:
+
+```
+git clone https://github.com/Maldela/fancontrol-gui.git
+cd fancontrol-gui
+mkdir build
+cd build
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_KCM=on
+make -j2
+sudo make install
+```

+ 2 - 2
import/CMakeLists.txt

@@ -48,5 +48,5 @@ include_directories(${Qt5Qml_INCLUDE_DIRS})
 add_library(fancontrol_qml_plugin SHARED ${LIB_SRCS})
 target_link_libraries(fancontrol_qml_plugin PRIVATE ${LIB_PRIVATE_LIBRARIES} PUBLIC ${LIB_PUBLIC_LIBRARIES})
 
-install(TARGETS fancontrol_qml_plugin DESTINATION "${KDE_INSTALL_QMLDIR}/Fancontrol/Qml/")
-install(FILES ${QML_FILES} DESTINATION "${KDE_INSTALL_QMLDIR}/Fancontrol/Qml/")
+install(TARGETS fancontrol_qml_plugin DESTINATION "${KDE_INSTALL_LIBDIR}/qt/qml/Fancontrol/Qml/")
+install(FILES ${QML_FILES} DESTINATION "${KDE_INSTALL_FULL_LIBDIR}/qt/qml/Fancontrol/Qml/")