Browse Source

removed ${LIB_INSTALL_DIR}

Malte Veerman 10 years ago
parent
commit
7dcc6c3828
3 changed files with 7 additions and 7 deletions
  1. 3 3
      share/CMakeLists.txt
  2. 2 2
      share/src/sensors.h
  3. 2 2
      share/src/systemdcommunicator.cpp

+ 3 - 3
share/CMakeLists.txt

@@ -38,6 +38,6 @@ target_link_libraries(fancontrol-gui-share ${LIBRARIES})
 
 
 install(DIRECTORY qml DESTINATION "${SHARE_INSTALL_PREFIX}/fancontrol-gui")
 install(DIRECTORY qml DESTINATION "${SHARE_INSTALL_PREFIX}/fancontrol-gui")
 install(DIRECTORY javascript DESTINATION "${SHARE_INSTALL_PREFIX}/fancontrol-gui")
 install(DIRECTORY javascript DESTINATION "${SHARE_INSTALL_PREFIX}/fancontrol-gui")
-install(FILES ${LIB_HEADER} DESTINATION "${LIB_INSTALL_DIR}/fancontrol-gui/include")
-install(TARGETS fancontrol-gui-share DESTINATION ${LIB_INSTALL_DIR} EXPORT libfancontrol-gui-share-targets)
-install(EXPORT libfancontrol-gui-share-targets DESTINATION "${LIB_INSTALL_DIR}/fancontrol-gui")
+install(FILES ${LIB_HEADER} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/fancontrol-gui/include")
+install(TARGETS fancontrol-gui-share DESTINATION ${CMAKE_INSTALL_PREFIX}/lib EXPORT libfancontrol-gui-share-targets)
+install(EXPORT libfancontrol-gui-share-targets DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/fancontrol-gui")

+ 2 - 2
share/src/sensors.h

@@ -113,8 +113,8 @@ public:
     QString name() const;
     QString name() const;
     void setName(const QString &name);
     void setName(const QString &name);
 
 
-    virtual int pwm() const { return 0; }
-    virtual void setPwm(int) { qDebug() << "setPwm(int) is not implemented in standard Fan"; }
+    virtual int pwm() const { return 255; }
+//    virtual void setPwm(int) { qDebug() << "setPwm(int) is not implemented in standard Fan"; }
 
 
 
 
 signals:
 signals:

+ 2 - 2
share/src/systemdcommunicator.cpp

@@ -59,7 +59,7 @@ void SystemdCommunicator::setServiceName(const QString &name)
             }
             }
             else
             else
             {
             {
-                m_serviceObjectPath = qdbus_cast<QDBusObjectPath>(dbusreply.arguments().first()).path();
+                m_serviceObjectPath = qdbus_cast<QDBusObjectPath>(dbusreply.arguments().at(0)).path();
 
 
                 if (m_serviceInterface)
                 if (m_serviceInterface)
                     m_serviceInterface->deleteLater();
                     m_serviceInterface->deleteLater();
@@ -90,7 +90,7 @@ bool SystemdCommunicator::serviceExists()
         emit errorChanged();
         emit errorChanged();
         return false;
         return false;
     }
     }
-    SystemdUnitFileList list = qdbus_cast<SystemdUnitFileList>(dbusreply.arguments().first());
+    SystemdUnitFileList list = qdbus_cast<SystemdUnitFileList>(dbusreply.arguments().at(0));
 
 
     foreach (const SystemdUnitFile &unitFile, list)
     foreach (const SystemdUnitFile &unitFile, list)
     {
     {