diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index a945762..d599c5e 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.21) -project(RibbonUIAPP VERSION ${CMAKE_PROJECT_VERSION} LANGUAGES CXX) +project(RibbonUIAPP VERSION ${PROJECT_VERSION} LANGUAGES CXX) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -22,7 +22,7 @@ set(PROJECT_COPYRIGHT "Copyright (c) 2024 Mentalflow's Lab. All rights reserved. set(PROJECT_DOMAIN "dev.ourdocs.cn.ribbonuiapp") set(PROJECT_BUNDLE_NAME RibbonUI-APP) -set(version_str "${CMAKE_PROJECT_VERSION_MAJOR},${CMAKE_PROJECT_VERSION_MINOR},${CMAKE_PROJECT_VERSION_PATCH}") +set(version_str "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}") add_definitions(-DRIBBONUIAPP_VERSION=${version_str}) find_package(Qt6 COMPONENTS Quick REQUIRED) @@ -70,7 +70,7 @@ endif () qt_add_qml_module(${PROJECT_NAME} URI ${PROJECT_NAME} - VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR} + VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} RESOURCE_PREFIX "/qt/qml/" QML_FILES example.qml components/RibbonWindow.qml RESOURCES resources/imgs/heart.png resources/imgs/search.png resources/icon.rc diff --git a/lib_source/CMakeLists.txt b/lib_source/CMakeLists.txt index 30b9092..6e7bd3d 100644 --- a/lib_source/CMakeLists.txt +++ b/lib_source/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.21) -project(RibbonUI VERSION ${CMAKE_PROJECT_VERSION} LANGUAGES CXX) +project(RibbonUI VERSION ${PROJECT_VERSION} LANGUAGES CXX) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -19,7 +19,7 @@ endif() find_package(Qt6 COMPONENTS Core Quick Qml REQUIRED) -set(version_str "${CMAKE_PROJECT_VERSION_MAJOR},${CMAKE_PROJECT_VERSION_MINOR},${CMAKE_PROJECT_VERSION_PATCH}") +set(version_str "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}") add_definitions(-DRIBBONUI_VERSION=${version_str}) if (RIBBONUI_BUILD_STATIC_LIB) @@ -54,7 +54,7 @@ qt_add_qml_module(${PROJECT_NAME} PLUGIN_TARGET ${PLUGIN_TARGET_NAME} OUTPUT_DIRECTORY ${RIBBONUI_QML_PLUGIN_DIRECTORY} URI ${PROJECT_NAME} - VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR} + VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} QML_FILES ${qml_files} SOURCES ribbonui.cpp ribbonui.h definitions.h ribbontheme.h ribbontheme.cpp RESOURCES resources/FluentSystemIcons-Resizable.ttf resources/imgs/icon.png