Forráskód Böngészése

Always use qt install path so qml plugin is always found

Maldela 9 éve
szülő
commit
98102103bc
2 módosított fájl, 3 hozzáadás és 3 törlés
  1. 1 1
      CMakeLists.txt
  2. 2 2
      import/CMakeLists.txt

+ 1 - 1
CMakeLists.txt

@@ -16,7 +16,7 @@ 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)
+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

+ 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_LIBDIR}/qt/qml/Fancontrol/Qml/")
-install(FILES ${QML_FILES} DESTINATION "${KDE_INSTALL_FULL_LIBDIR}/qt/qml/Fancontrol/Qml/")
+install(TARGETS fancontrol_qml_plugin DESTINATION "${KDE_INSTALL_QMLDIR}/Fancontrol/Qml/")
+install(FILES ${QML_FILES} DESTINATION "${KDE_INSTALL_FULL_QMLDIR}/Fancontrol/Qml/")