Browse Source

stopped using KDE_INSTALL_QMLDIR with KDE_INSTALL_USE_QT_SYS_PATHS set to ON. It behaved badly with different install prefixes than /usr.

maldela 7 years ago
parent
commit
4635a8d28b
2 changed files with 2 additions and 4 deletions
  1. 0 2
      CMakeLists.txt
  2. 2 2
      import/CMakeLists.txt

+ 0 - 2
CMakeLists.txt

@@ -16,8 +16,6 @@ set(STANDARD_CONFIG_FILE "/etc/fancontrol" CACHE STRING "The location of the sta
 add_definitions(-DSTANDARD_SERVICE_NAME="${STANDARD_SERVICE_NAME}")
 add_definitions(-DSTANDARD_CONFIG_FILE="${STANDARD_CONFIG_FILE}")
 
-set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Use Qt install paths so the qml plugin is always found" FORCE)
-
 
 #KCM can't be build without systemd support
 if(BUILD_KCM AND NO_SYSTEMD)

+ 2 - 2
import/CMakeLists.txt

@@ -48,8 +48,8 @@ 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 "${CMAKE_INSTALL_PREFIX}/lib/qt/qml/Fancontrol/Qml/")
+install(FILES ${QML_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/qt/qml/Fancontrol/Qml/")
 
 
 #tests