Compare commits

...

2 Commits

Author SHA1 Message Date
f56824ccc7 2.4.20 2024-02-12 16:46:01 +03:00
2260a5ac5f Совместимость c CMake 3.7 2024-02-12 16:45:38 +03:00
7 changed files with 10 additions and 8 deletions

View File

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

View File

@ -111,7 +111,9 @@ function(myx_target_setup TARGET_NAME)
endif()
endif()
else()
target_link_libraries(${TARGET_NAME} PRIVATE ${__link_library})
if((${CMAKE_VERSION} VERSION_GREATER "3.7.99") OR (NOT __target_type STREQUAL "OBJECT_LIBRARY"))
target_link_libraries(${TARGET_NAME} PRIVATE ${__link_library})
endif()
endif()
endforeach()
endif()

View File

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

View File

@ -1 +1 @@
2.4.19
2.4.20

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
project(myx-cmake VERSION 2.4.19 LANGUAGES)
project(myx-cmake VERSION 2.4.20 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.19) unstable; urgency=medium
myx-cmake (2.4.20) unstable; urgency=medium
* New version.

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