2.4.46

MyxCMake/MyxCMakeConfig.cmake

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

MyxCMake/MyxCMakeConfigVersion.cmake

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

MyxCMake/lib/generators/GitInfo.cmake

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

README.md

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

VERSION

@@ -1 +1 @@
-2.4.44
+2.4.46

debian/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-project(myx-cmake VERSION 2.4.44 LANGUAGES)
+project(myx-cmake VERSION 2.4.46 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

debian/changelog

@@ -1,4 +1,4 @@
-myx-cmake (2.4.44) unstable; urgency=medium
+myx-cmake (2.4.46) unstable; urgency=medium
 
   * New version.
 

myx_setup.cmake

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