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

Compare commits

base: cmake:c04c9900c6dfd1fe083dc6227f27a670e4b7a7de
Branches Tags
cmake:master
cmake:2.4.45
cmake:2.4.44
cmake:2.4.43
cmake:2.4.42
..
compare: cmake:846e02c1e74d01f0bafeb12b8ebd73e7d04cea78
Branches Tags
cmake:master
cmake:2.4.45
cmake:2.4.44
cmake:2.4.43
cmake:2.4.42

3 Commits
c04c9900c6 ... 846e02c1e7

Author SHA1 Message Date
Andrei Astafev
846e02c1e7 2.4.18 2023-12-12 12:24:40 +03:00
Andrei Astafev
13a95cf650 Приватный заголовок запрещёл для нитерфейсной цели 2023-12-12 12:23:31 +03:00
Andrei Astafev
399a9f2464 Совместимость с CMake 3.7 2023-12-12 11:31:40 +03:00
8 changed files with 16 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
MyxCMake/MyxCMakeConfigVersion.cmake
View File

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

2
MyxCMake/lib/TargetSetupQt.cmake
View File

@ -33,6 +33,8 @@ function(myx_target_setup_qt TARGET_NAME)
endif() endif()
if((${CMAKE_VERSION} VERSION_GREATER "3.8.0") AND (__target_type STREQUAL "OBJECT_LIBRARY")) if((${CMAKE_VERSION} VERSION_GREATER "3.8.0") AND (__target_type STREQUAL "OBJECT_LIBRARY"))
target_link_libraries(${TARGET_NAME} PUBLIC Qt${myx_qt_ver}::${iter}) target_link_libraries(${TARGET_NAME} PUBLIC Qt${myx_qt_ver}::${iter})
else()
target_include_directories(${TARGET_NAME} PUBLIC ${Qt${myx_qt_ver}${iter}_INCLUDE_DIRS})
endif() endif()
endif() endif()
endforeach() endforeach()

5
MyxCMake/lib/generators/PrivateConfigHeader.cmake
View File

@ -31,5 +31,10 @@ function(myx_generate_private_config_header TARGET_NAME BASE_FILENAME)
configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PrivateConfig.hpp.in" ${__filename}) configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PrivateConfig.hpp.in" ${__filename})
set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${__filename}) set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${__filename})
get_target_property(__target_type ${TARGET_NAME} TYPE)
if(${__target_type} STREQUAL "INTERFACE_LIBRARY")
target_sources(${TARGET_NAME} INTERFACE ${__filename})
else()
target_sources(${TARGET_NAME} PRIVATE ${__filename}) target_sources(${TARGET_NAME} PRIVATE ${__filename})
endif()
endfunction() endfunction()

2
README.md
View File

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

2
VERSION
View File

@ -1 +1 @@
2.4.17 2.4.18

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