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

Compare commits

base: cmake:ec065f79434c5fe31fe43df1d1f7e1ce28e73a20
Branches Tags
cmake:master
cmake:2.4.46
..
compare: cmake:eec3b3c3923d0ecbe6ce11d2db1af109e92bb0a3
Branches Tags
cmake:master
cmake:2.4.46

No commits in common. "ec065f79434c5fe31fe43df1d1f7e1ce28e73a20" and "eec3b3c3923d0ecbe6ce11d2db1af109e92bb0a3" have entirely different histories.
ec065f7943 ... eec3b3c392

8 changed files with 11 additions and 15 deletions
Show Stats Expand all files Collapse all files

4
MyxCMake/MyxCMakeConfig.cmake
View File

@ -1,7 +1,5 @@
cmake_policy(PUSH) cmake_policy(PUSH)
if(POLICY CMP0057) cmake_policy(SET CMP0057 NEW) # IN_LIST operator
cmake_policy(SET CMP0057 NEW) # IN_LIST operator
endif()
# CMake выполняет проверку системного окружения с помощью модулей, # CMake выполняет проверку системного окружения с помощью модулей,
# расположенных в следующих каталогах: # расположенных в следующих каталогах:

2
MyxCMake/MyxCMakeConfigVersion.cmake
View File

@ -1,4 +1,4 @@
set(MYX_CMAKE_PACKAGE_VERSION "2.4.46") set(MYX_CMAKE_PACKAGE_VERSION "2.4.44")
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/generators/GitInfo.cmake
View File

@ -1,7 +1,5 @@
cmake_policy(PUSH) cmake_policy(PUSH)
if(POLICY CMP0053) cmake_policy(SET CMP0053 NEW) # IN_LIST operator
cmake_policy(SET CMP0053 NEW)
endif()
set(ARG_PREFIX "${PREFIX}") set(ARG_PREFIX "${PREFIX}")
set(GIT_REV "N/A") set(GIT_REV "N/A")

2
README.md
View File

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

2
VERSION
View File

@ -1 +1 @@
2.4.46 2.4.44

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.46 LANGUAGES) project(myx-cmake VERSION 2.4.44 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.46) unstable; urgency=medium myx-cmake (2.4.44) unstable; urgency=medium
* New version. * New version.

8
myx_setup.cmake
View File

@ -16,15 +16,15 @@
проекта использовать дополнительные инструменты для его сопровождения. проекта использовать дополнительные инструменты для его сопровождения.
#]=======================================================================] #]=======================================================================]
if(DEFINED ENV{MYX_CMAKE_DIR}) 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.46 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) find_package(MyxCMake 2.4.44 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.46 REQUIRED) find_package(MyxCMake 2.4.44 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)
@ -32,7 +32,7 @@ else()
endif() endif()
endif() endif()
if(DEFINED ENV{MYXX_CMAKE_DIR}) if(ENV{MYXX_CMAKE_DIR})
set(MYXX_CMAKE_DIR $ENV{MYXX_CMAKE_DIR}) set(MYXX_CMAKE_DIR $ENV{MYXX_CMAKE_DIR})
endif() endif()
if(MYXX_CMAKE_DIR) if(MYXX_CMAKE_DIR)