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

2.0.10

Browse Source
This commit is contained in:
Andrei Astafev 2022-10-08 22:23:10 +03:00
parent ac54e882b7
commit 7bb178b24d
9 changed files with 35 additions and 16 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.0.9") set(MYX_CMAKE_PACKAGE_VERSION "2.0.10")
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE) set(PACKAGE_VERSION_COMPATIBLE FALSE)
else() else()

4
MyxCMake/lib/CurrentDate.cmake
View File

@ -1,7 +1,7 @@
include_guard(GLOBAL) include_guard(GLOBAL)
if(NOT MYX_TODAY) if(NOT MYX_TODAY)
if(WIN32) if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE MYX_TODAY) execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE MYX_TODAY)
else() else()
execute_process(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE MYX_TODAY) execute_process(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE MYX_TODAY)
@ -10,7 +10,7 @@ if(NOT MYX_TODAY)
endif() endif()
if(NOT MYX_YEAR) if(NOT MYX_YEAR)
if(WIN32) if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE MYX_YEAR) execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE MYX_YEAR)
else() else()
execute_process(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE MYX_YEAR) execute_process(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE MYX_YEAR)

2
MyxCMake/lib/Qt5TargetSetup.cmake
View File

@ -73,7 +73,7 @@ function(myx_qt5_target_setup NAME)
# и его компиляция в каталог ${PROJECT_BINARY_DIR} # и его компиляция в каталог ${PROJECT_BINARY_DIR}
qt5_create_translation(qm ${tr} qt5_create_translation(qm ${tr}
"${PROJECT_SOURCE_DIR}/l10n/${NAME}_${iter}.ts" "${PROJECT_SOURCE_DIR}/l10n/${NAME}_${iter}.ts"
OPTIONS -I ${PROJECT_SOURCE_DIR}/include) OPTIONS -I ${PROJECT_SOURCE_DIR}/include -I ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
# Добавление записи для скомпилированного файла переводов в ресурсный файл # Добавление записи для скомпилированного файла переводов в ресурсный файл
file(APPEND ${PROJECT_BINARY_DIR}/${NAME}_l10n.qrc file(APPEND ${PROJECT_BINARY_DIR}/${NAME}_l10n.qrc
"<file alias=\"${NAME}_${iter}\">${NAME}_${iter}.qm</file>\n") "<file alias=\"${NAME}_${iter}\">${NAME}_${iter}.qm</file>\n")

19
MyxCMake/lib/macro/SkipExternalTarget.cmake
View File

@ -2,13 +2,32 @@ include_guard(GLOBAL)
# Пропуск целей, которые создаются автоматически в `CMAKE_BINARY_DIR` # Пропуск целей, которые создаются автоматически в `CMAKE_BINARY_DIR`
macro(myx_skip_external_target NAME) macro(myx_skip_external_target NAME)
get_target_property(__type ${NAME} TYPE)
if(__type STREQUAL "INTERFACE_LIBRARY")
get_target_property(__sources ${NAME} INTERFACE_SOURCES)
foreach(iter ${_sources})
string(FIND ${iter} ${CMAKE_BINARY_DIR} __pos)
if(__pos EQUAL 0)
unset(__type)
unset(__pos)
unset(__sources)
return()
endif()
endforeach()
unset(__type)
unset(__pos)
unset(__sources)
else()
get_target_property(__source_dir ${NAME} SOURCE_DIR) get_target_property(__source_dir ${NAME} SOURCE_DIR)
string(FIND ${__source_dir} ${CMAKE_BINARY_DIR} __pos) string(FIND ${__source_dir} ${CMAKE_BINARY_DIR} __pos)
if(__pos EQUAL 0) if(__pos EQUAL 0)
unset(__type)
unset(__pos) unset(__pos)
unset(__source_dir) unset(__source_dir)
return() return()
endif() endif()
unset(__pos) unset(__pos)
unset(__source_dir) unset(__source_dir)
endif()
unset(__type)
endmacro(myx_skip_external_target NAME) endmacro(myx_skip_external_target NAME)

2
README.md
View File

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

2
VERSION
View File

@ -1 +1 @@
2.0.9 2.0.10

2
debian/CMakeLists.txt vendored
View File

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

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
myx-cmake (2.0.9) unstable; urgency=medium myx-cmake (2.0.10) unstable; urgency=medium
* New version. * 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}) set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
endif() endif()
if(MYX_CMAKE_DIR) if(MYX_CMAKE_DIR)
find_package(MyxCMake 2.0.9 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) find_package(MyxCMake 2.0.10 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
else() else()
if(MYX_CMAKE_USE_SYSTEM) if(MYX_CMAKE_USE_SYSTEM)
find_package(MyxCMake 2.0.9 REQUIRED) find_package(MyxCMake 2.0.10 REQUIRED)
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
else() else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)