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

Compare commits

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

No commits in common. "master" and "2.4.43" have entirely different histories.
master ... 2.4.43

8 changed files with 8 additions and 18 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.44") set(MYX_CMAKE_PACKAGE_VERSION "2.4.42")
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()

6
MyxCMake/lib/DownloadContent.cmake
View File

@ -70,11 +70,7 @@ function(myx_download_content NAME)
if(ENABLE_DOWNLOAD_CONTENT AND GIT_EXECUTABLE AND ARG_GIT_REPOSITORY) if(ENABLE_DOWNLOAD_CONTENT AND GIT_EXECUTABLE AND ARG_GIT_REPOSITORY)
if(NOT IS_DIRECTORY ${WORK_DIR}) if(NOT IS_DIRECTORY ${WORK_DIR})
execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ARG_GIT_REPOSITORY} ${NAME} execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ARG_GIT_REPOSITORY} ${NAME}
WORKING_DIRECTORY ${ARG_DOWNLOAD_DIR} WORKING_DIRECTORY ${ARG_DOWNLOAD_DIR})
RESULT_VARIABLE clone_result)
if(NOT clone_result EQUAL 0)
myx_message_fatal_error("Git can't clone ${NAME} from ${ARG_GIT_REPOSITORY}")
endif()
else() else()
if(ARG_AUTOFETCH) if(ARG_AUTOFETCH)
execute_process(COMMAND ${GIT_EXECUTABLE} fetch execute_process(COMMAND ${GIT_EXECUTABLE} fetch

6
MyxCMake/lib/doc/Doxyfile.in
View File

@ -29,9 +29,3 @@ TEMPLATE_RELATIONS = YES
CALL_GRAPH = YES CALL_GRAPH = YES
CALLER_GRAPH = YES CALLER_GRAPH = YES
INTERACTIVE_SVG = YES INTERACTIVE_SVG = YES
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
PREDEFINED = __attribute__(x)=

2
README.md
View File

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

2
VERSION
View File

@ -1 +1 @@
2.4.44 2.4.42

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