From f22913db9df992d0b6c135a2c329e7359969a3c5 Mon Sep 17 00:00:00 2001 From: Andrei Astafev Date: Tue, 1 Aug 2023 11:46:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BA=20HEAD,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=20=D0=BF=D0=B0=D1=80=D0=B0?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D1=80=20GIT=5FTAG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MyxCMake/lib/DownloadContent.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/MyxCMake/lib/DownloadContent.cmake b/MyxCMake/lib/DownloadContent.cmake index ad4ef03..aecca67 100644 --- a/MyxCMake/lib/DownloadContent.cmake +++ b/MyxCMake/lib/DownloadContent.cmake @@ -61,8 +61,13 @@ function(myx_download_content NAME) execute_process(COMMAND ${GIT_EXECUTABLE} fetch WORKING_DIRECTORY ${ARG_DOWNLOAD_DIR}/${NAME}) endif() - execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ARG_GIT_TAG} - WORKING_DIRECTORY ${ARG_DOWNLOAD_DIR}/${NAME}) + if(ARG_GIT_TAG) + 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}) + endif() endif() if(NOT CMAKE_SCRIPT_MODE_FILE)