cmake/myx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

2.4.42

Browse Source
This commit is contained in:
Andrei Astafev 2024-04-10 23:22:41 +03:00
parent 669bbff8ef
commit 14ee051dcb
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MyxCMake/MyxCMakeConfigVersion.cmake
View File

@ -1,4 +1,4 @@
set(MYX_CMAKE_PACKAGE_VERSION "2.4.41")
set(MYX_CMAKE_PACKAGE_VERSION "2.4.42")
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()

4
MyxCMake/lib/macro/FindQt.cmake
View File

@ -22,14 +22,14 @@ macro(myx_find_qt)
message(FATAL_ERROR "Supported Qt versions are 5 and 6")
endif()
if(ARG_REQUIRED)
if(ARG_REQUIRED AND 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)
if(ARG_REQUIRED AND ARG_COMPONENTS)
message("-- MyxCMake: searching required Qt components: ${ARG_COMPONENTS}")
endif()
foreach(iter ${ARG_COMPONENTS})

2
README.md
View File

@ -3,7 +3,7 @@
## Установка
В корневом каталоге проекта создать каталог `cmake` и распаковать в него
[архив](../../../releases/download/2.4.41/myx-cmake-local-2.4.41.tar.xz ).
[архив](../../../releases/download/2.4.42/myx-cmake-local-2.4.42.tar.xz ).
## Использование

2
VERSION
View File

@ -1 +1 @@
2.4.41
2.4.42

2
debian/CMakeLists.txt vendored
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
project(myx-cmake VERSION 2.4.41 LANGUAGES)
project(myx-cmake VERSION 2.4.42 LANGUAGES)
include(GNUInstallDirs)
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
myx-cmake (2.4.41) unstable; urgency=medium
myx-cmake (2.4.42) unstable; urgency=medium
* New version.

4
myx_setup.cmake
View File

@ -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.41 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
find_package(MyxCMake 2.4.42 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.41 REQUIRED)
find_package(MyxCMake 2.4.42 REQUIRED)
myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)