diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/src/Caelestia/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt index 0228765..5fd58ad 100644 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -4,6 +4,8 @@ if(QT_KNOWN_POLICY_QTP0001) qt_policy(SET QTP0001 NEW) endif() +string(REGEX MATCH "^[0-9]+\\.[0-9]+" VERSION_SHORT "${VERSION}") + set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml") qt_standard_project_setup() add_subdirectory(src/Caelestia) diff --git a/plugin/src/Caelestia/CMakeLists.txt b/plugin/src/Caelestia/CMakeLists.txt index 8a6152a..5ce0800 100644 --- a/plugin/src/Caelestia/CMakeLists.txt +++ b/plugin/src/Caelestia/CMakeLists.txt @@ -4,7 +4,7 @@ pkg_check_modules(AUBIO REQUIRED aubio) qt_add_qml_module(caelestia URI Caelestia - VERSION ${VERSION} + VERSION ${VERSION_SHORT} SOURCES cutils.hpp cutils.cpp cachingimagemanager.hpp cachingimagemanager.cpp @@ -23,10 +23,10 @@ qt_query_qml_module(caelestia TARGET_PATH module_target_path QMLDIR module_qmldir TYPEINFO module_typeinfo - QML_FILES module_qml_files - RESOURCES module_resources ) +message(STATUS "Created QML module ${module_uri}, version ${module_version}") + set(module_dir "${INSTALL_QMLDIR}/${module_target_path}") install(TARGETS caelestia LIBRARY DESTINATION "${module_dir}" RUNTIME DESTINATION "${module_dir}") install(TARGETS "${module_plugin_target}" LIBRARY DESTINATION "${module_dir}" RUNTIME DESTINATION "${module_dir}") |