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

2.0.30

Browse Source
This commit is contained in:
Andrei Astafev 2022-10-20 12:45:27 +03:00
parent 9f755b3bdb
commit e80b8d4a02
9 changed files with 22 additions and 19 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.29") set(MYX_CMAKE_PACKAGE_VERSION "2.0.30")
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()

5
MyxCMake/lib/AddInterfaceLibrary.cmake
View File

@ -48,10 +48,9 @@ function(myx_add_interface_library TARGET_NAME)
endif() endif()
# Вызов стандартной функции `add_library()` # Вызов стандартной функции `add_library()`
if(${CMAKE_VERSION} VERSION_LESS "3.13.0") if(${CMAKE_VERSION} VERSION_LESS "3.19.0")
add_library(${TARGET_NAME} INTERFACE) add_library(${TARGET_NAME} INTERFACE)
# TODO target_sources(${TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${ARG_HEADERS}>)
# target_sources(${TARGET_NAME} INTERFACE ${ARG_HEADERS})
else() else()
add_library(${TARGET_NAME} INTERFACE ${ARG_HEADERS}) add_library(${TARGET_NAME} INTERFACE ${ARG_HEADERS})
endif() endif()

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

@ -1,9 +1,9 @@
include_guard(GLOBAL) include_guard(GLOBAL)
macro(myx_create_symlink original linkname) macro(myx_create_symlink original linkname)
if(NOT EXISTS ${linkname}) if(UNIX AND (NOT EXISTS ${linkname}))
if(${CMAKE_VERSION} VERSION_LESS "3.14.0") if(${CMAKE_VERSION} VERSION_LESS "3.14.0")
execute_process(COMMAND ${CMAKE_COMMAND} -E myx_create_symlink ${original} ${linkname}) execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${original} ${linkname})
else() else()
file(CREATE_LINK ${original} ${linkname} SYMBOLIC) file(CREATE_LINK ${original} ${linkname} SYMBOLIC)
endif() endif()

18
MyxCMake/lib/uncrustify/Uncrustify.cmake
View File

@ -46,13 +46,17 @@ function(myx_uncrustify TARGET_NAME)
endif() endif()
# Динамически сгенерированные файлы исключаются # Динамически сгенерированные файлы исключаются
get_target_property(__s1 ${TARGET_NAME} INTERFACE_SOURCES) get_target_property(__target_type ${TARGET_NAME} TYPE)
if(__s1) if(${__target_type} STREQUAL "INTERFACE_LIBRARY")
list(APPEND __all_sources ${__s1}) get_target_property(__s1 ${TARGET_NAME} INTERFACE_SOURCES)
endif() if(__s1)
get_target_property(__s2 ${TARGET_NAME} SOURCES) list(APPEND __all_sources ${__s1})
if(__s2) endif()
list(APPEND __all_sources ${__s2}) else()
get_target_property(__s2 ${TARGET_NAME} SOURCES)
if(__s2)
list(APPEND __all_sources ${__s2})
endif()
endif() endif()
foreach(iter ${__all_sources}) foreach(iter ${__all_sources})

2
README.md
View File

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

2
VERSION
View File

@ -1 +1 @@
2.0.29 2.0.30

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.29 LANGUAGES) project(myx-cmake VERSION 2.0.30 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.29) unstable; urgency=medium myx-cmake (2.0.30) 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.29 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) find_package(MyxCMake 2.0.30 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.29 REQUIRED) find_package(MyxCMake 2.0.30 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)