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

Compare commits

base: cmake:42216b4f4fbcfcfb85fbf18585fed5bc3a2009f2
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

No commits in common. "42216b4f4fbcfcfb85fbf18585fed5bc3a2009f2" and "846e02c1e74d01f0bafeb12b8ebd73e7d04cea78" have entirely different histories.
42216b4f4f ... 846e02c1e7

8 changed files with 9 additions and 10 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.19") 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()

4
MyxCMake/lib/TargetSetup.cmake
View File

@ -3,8 +3,7 @@ include_guard(GLOBAL)
function(myx_target_setup TARGET_NAME) function(myx_target_setup TARGET_NAME)
set(options) set(options)
set(oneValueArgs PCH) set(oneValueArgs PCH)
set(multiValueArgs PACKAGES set(multiValueArgs COMPILE_DEFINITIONS PACKAGES LINK_LIBRARIES
COMPILE_DEFINITIONS INCLUDE_DIRECTORIES LINK_LIBRARIES
CPP PUBLIC_HEADERS PRIVATE_HEADERS) CPP PUBLIC_HEADERS PRIVATE_HEADERS)
cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@ -79,7 +78,6 @@ function(myx_target_setup TARGET_NAME)
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 $<BUILD_INTERFACE:${ARG_INTERFACE_HEADERS}>) target_sources(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ARG_INTERFACE_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})
# CMake до версии 3.12 не умеет извлекать из целей типа `OBJECT_LIBRARY` # CMake до версии 3.12 не умеет извлекать из целей типа `OBJECT_LIBRARY`
# информацию о заголовочных файлах. Это обход. # информацию о заголовочных файлах. Это обход.

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

@ -65,6 +65,7 @@ function(myx_uncrustify TARGET_NAME)
endif() endif()
endforeach() endforeach()
target_sources(${TARGET_NAME} PRIVATE ${ARG_CONFIG})
set(__fixed_config ${PROJECT_BINARY_DIR}/uncrustify-${TARGET_NAME}.cfg) set(__fixed_config ${PROJECT_BINARY_DIR}/uncrustify-${TARGET_NAME}.cfg)
add_custom_command(OUTPUT ${__fixed_config} add_custom_command(OUTPUT ${__fixed_config}
DEPENDS ${ARG_CONFIG} DEPENDS ${ARG_CONFIG}

2
README.md
View File

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

2
VERSION
View File

@ -1 +1 @@
2.4.19 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.19 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.19) 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.19 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.19 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)