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

myx update

Browse Source
This commit is contained in:
Andrei Astafev
2022-10-20 13:32:54 +03:00
parent 84e5c74ac6
commit 16bfa7aac9
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/myx/MyxCMakeConfigVersion.cmake
View File

@@ -1,4 +1,4 @@
set(MYX_CMAKE_PACKAGE_VERSION "2.0.31") set(MYX_CMAKE_PACKAGE_VERSION "2.0.32")
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()

1
cmake/myx/lib/generators/GitInfoHeader.cmake
View File

@@ -52,4 +52,5 @@ function(myx_generate_git_info_header TARGET_NAME BASE_FILENAME)
set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${__filename}) set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${__filename})
target_sources(${TARGET_NAME} PRIVATE ${__filename}) target_sources(${TARGET_NAME} PRIVATE ${__filename})
add_dependencies(${TARGET_NAME} ${TARGET_NAME}-git-info-header)
endfunction() endfunction()

2
cmake/myx/lib/uncrustify/Uncrustify.cmake
View File

@@ -47,7 +47,7 @@ function(myx_uncrustify TARGET_NAME)
# Динамически сгенерированные файлы исключаются # Динамически сгенерированные файлы исключаются
get_target_property(__target_type ${TARGET_NAME} TYPE) get_target_property(__target_type ${TARGET_NAME} TYPE)
if(${__target_type} STREQUAL "INTERFACE_LIBRARY") if((${__target_type} STREQUAL "INTERFACE_LIBRARY") AND (${CMAKE_VERSION} VERSION_LESS "3.15.0"))
get_target_property(__s1 ${TARGET_NAME} INTERFACE_SOURCES) get_target_property(__s1 ${TARGET_NAME} INTERFACE_SOURCES)
if(__s1) if(__s1)
list(APPEND __all_sources ${__s1}) list(APPEND __all_sources ${__s1})

4
cmake/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.31 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) find_package(MyxCMake 2.0.32 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.31 REQUIRED) find_package(MyxCMake 2.0.32 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)