From 82e9a87f4d2ec615c8400d889042d7c7f17d53a3 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sun, 30 Jul 2023 15:45:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D1=87=D0=BD=D1=8F=20=D0=B0=D1=80=D0=B3=D1=83?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BC=D0=B0=D0=BA=D1=80=D0=BE=D1=81=D0=B0=20`myx=5Fqt=5Ftarget?= =?UTF-8?q?=5Fsetup`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- MyxCMake/lib/macro/QtTargetSetup.cmake | 4 ++-- README.md | 2 +- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- myx_setup.cmake | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index a2910cf..5eee7a2 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.1") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.2") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/macro/QtTargetSetup.cmake b/MyxCMake/lib/macro/QtTargetSetup.cmake index 5a71130..861e6fb 100644 --- a/MyxCMake/lib/macro/QtTargetSetup.cmake +++ b/MyxCMake/lib/macro/QtTargetSetup.cmake @@ -2,8 +2,8 @@ include_guard(GLOBAL) macro(myx_qt_target_setup TARGET_NAME) set(options) - set(oneValueArgs) - set(multiValueArgs COMPONENTS PRIVATE) + set(oneValueArgs VERSION) + set(multiValueArgs COMPONENTS PRIVATE PUBLIC_MOC PRIVATE_MOC UI QRC LANGS) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) diff --git a/README.md b/README.md index 95e3009..17c56f8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.1/myx-cmake-local-2.4.1.tar.xz ). +[архив](../../../releases/download/2.4.2/myx-cmake-local-2.4.2.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 005119b..8e8299d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.1 +2.4.2 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 9e8ad40..de67299 100644 --- a/debian/CMakeLists.txt +++ b/debian/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.6 FATAL_ERROR) -project(myx-cmake VERSION 2.4.1 LANGUAGES) +project(myx-cmake VERSION 2.4.2 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 9739e5d..0c93f2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.1) unstable; urgency=medium +myx-cmake (2.4.2) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index b4761b7..cd2f5a2 100644 --- a/myx_setup.cmake +++ b/myx_setup.cmake @@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR}) set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR}) endif() if(MYX_CMAKE_DIR) - find_package(MyxCMake 2.4.1 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.2 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 2.4.1 REQUIRED) + find_package(MyxCMake 2.4.2 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)