2.4.11

MyxCMake/MyxCMakeConfigVersion.cmake

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

MyxCMake/lib/DownloadContent.cmake

@@ -16,6 +16,8 @@ myx_download_content
 загрузить с помощью git.
 Параметр `GIT_TAG` содержит используемые метку, идентификатор коммита или
 ветку в загружаемом репозитории.
+Если указана опция `AUTOPULL`, то загруженный репозиторий будет
+обновляться автоматически.
 
 #]=======================================================================]
 
@@ -24,7 +26,7 @@ find_package(Git QUIET)
 option(ENABLE_DOWNLOAD_CONTENT "Enable download content" ON)
 
 function(myx_download_content NAME)
-  set(options)
+  set(options AUTOPULL)
   set(oneValueArgs)
   set(multiValueArgs DOWNLOAD_DIR GIT_REPOSITORY GIT_TAG)
   cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -65,8 +67,10 @@ function(myx_download_content NAME)
       execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ARG_GIT_TAG}
                       WORKING_DIRECTORY ${ARG_DOWNLOAD_DIR}/${NAME})
     else()
-      execute_process(COMMAND ${GIT_EXECUTABLE} pull
-                      WORKING_DIRECTORY ${ARG_DOWNLOAD_DIR}/${NAME})
+      if(ARG_AUTOPULL)
+        execute_process(COMMAND ${GIT_EXECUTABLE} pull
+                        WORKING_DIRECTORY ${ARG_DOWNLOAD_DIR}/${NAME})
+      endif()
     endif()
   endif()
 

README.md

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

VERSION

@@ -1 +1 @@
-2.4.10
+2.4.11

debian/CMakeLists.txt

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

debian/changelog

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

myx_setup.cmake

@@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR})
   set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
 endif()
 if(MYX_CMAKE_DIR)
-  find_package(MyxCMake 2.4.10 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.4.11 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.10 REQUIRED)
+    find_package(MyxCMake 2.4.11 REQUIRED)
     myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)