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

2.4.31

Browse Source
This commit is contained in:
Andrei Astafev 2024-03-16 12:09:46 +03:00
parent c61e9b7da0
commit 61650e44d1
8 changed files with 14 additions and 8 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.30") set(MYX_CMAKE_PACKAGE_VERSION "2.4.31")
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()

7
MyxCMake/lib/AddInterfaceLibrary.cmake
View File

@ -59,6 +59,13 @@ function(myx_add_interface_library TARGET_NAME)
foreach(lib ${ARG_LINK_LIBRARIES}) foreach(lib ${ARG_LINK_LIBRARIES})
if(TARGET ${lib}) if(TARGET ${lib})
set(exlib ${lib}) set(exlib ${lib})
get_target_property(type ${lib} TYPE)
if(type)
get_target_property(include_dirs ${lib} INTERFACE_INCLUDE_DIRECTORIES)
if(include_dirs)
target_include_directories(${TARGET_NAME} INTERFACE ${include_dirs})
endif()
endif()
if(${CMAKE_VERSION} VERSION_GREATER "3.13.0") if(${CMAKE_VERSION} VERSION_GREATER "3.13.0")
install(TARGETS ${lib} install(TARGETS ${lib}
EXPORT ${TARGET_NAME}Targets EXPORT ${TARGET_NAME}Targets

1
MyxCMake/lib/TargetSetup.cmake
View File

@ -76,7 +76,6 @@ function(myx_target_setup TARGET_NAME)
endif() endif()
target_sources(${TARGET_NAME} PRIVATE ${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS}) target_sources(${TARGET_NAME} PRIVATE ${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS})
target_sources(${TARGET_NAME} PUBLIC ${ARG_PUBLIC_HEADERS})
target_compile_definitions(${TARGET_NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS}) target_compile_definitions(${TARGET_NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS})
target_include_directories(${TARGET_NAME} PRIVATE ${ARG_INCLUDE_DIRECTORIES}) target_include_directories(${TARGET_NAME} PRIVATE ${ARG_INCLUDE_DIRECTORIES})

2
README.md
View File

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

2
VERSION
View File

@ -1 +1 @@
2.4.30 2.4.31

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