diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index f540f14..55c1a08 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.40") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.41") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/macro/FindQt.cmake b/MyxCMake/lib/macro/FindQt.cmake index 5cf70f0..901c4eb 100644 --- a/MyxCMake/lib/macro/FindQt.cmake +++ b/MyxCMake/lib/macro/FindQt.cmake @@ -23,14 +23,14 @@ macro(myx_find_qt) endif() if(ARG_REQUIRED) - message("MyxCMake: searching required Qt private components: ${ARG_PRIVATE}") + message("-- MyxCMake: searching required Qt private components: ${ARG_PRIVATE}") endif() foreach(iter ${ARG_PRIVATE}) find_package("Qt${ARG_VERSION}${iter}" COMPONENTS Private ${ARG_REQUIRED}) endforeach() if(ARG_REQUIRED) - message("MyxCMake: searching required Qt components: ${ARG_COMPONENTS}") + message("-- MyxCMake: searching required Qt components: ${ARG_COMPONENTS}") endif() foreach(iter ${ARG_COMPONENTS}) find_package(Qt${ARG_VERSION} COMPONENTS ${iter} ${ARG_REQUIRED}) diff --git a/MyxCMake/lib/uncrustify/Uncrustify.cmake b/MyxCMake/lib/uncrustify/Uncrustify.cmake index c7b01da..852dfa4 100644 --- a/MyxCMake/lib/uncrustify/Uncrustify.cmake +++ b/MyxCMake/lib/uncrustify/Uncrustify.cmake @@ -19,18 +19,18 @@ function(myx_uncrustify TARGET_NAME) endif() if(NOT EXISTS ${ARG_CONFIG}) - myx_message_notice("MyxCMake: uncrustify config is not found") + myx_message_notice("-- MyxCMake: uncrustify config is not found") return() endif() if(NOT UNCRUSTIFY_EXE) - myx_message_notice("MyxCMake: uncrustify executable is not found") + myx_message_notice("-- MyxCMake: uncrustify executable is not found") return() endif() get_filename_component(CONFIG_DIR ${ARG_CONFIG} DIRECTORY) if(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CONFIG_DIR}") - myx_message("MyxCMake: skip uncrustify for project ${PROJECT_NAME}") + myx_message("-- MyxCMake: skip uncrustify for project ${PROJECT_NAME}") return() endif() diff --git a/README.md b/README.md index 34b8d77..211a30f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.40/myx-cmake-local-2.4.40.tar.xz ). +[архив](../../../releases/download/2.4.41/myx-cmake-local-2.4.41.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 29630cd..1ab1376 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.40 +2.4.41 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 3bda560..3fae377 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.40 LANGUAGES) +project(myx-cmake VERSION 2.4.41 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index b6635d3..fd41bad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.40) unstable; urgency=medium +myx-cmake (2.4.41) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index ce6c46b..081e9e7 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.40 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.41 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.40 REQUIRED) + find_package(MyxCMake 2.4.41 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)