mirror of
				https://github.com/TheLartians/ModernCppStarter.git
				synced 2025-10-31 02:01:33 +01:00 
			
		
		
		
	update dependencies
This commit is contained in:
		
							parent
							
								
									082aa0c7df
								
							
						
					
					
						commit
						fb1d578ab4
					
				
					 2 changed files with 47 additions and 17 deletions
				
			
		|  | @ -28,7 +28,7 @@ | |||
| 
 | ||||
| cmake_minimum_required(VERSION 3.14 FATAL_ERROR) | ||||
| 
 | ||||
| set(CURRENT_CPM_VERSION 0.26.2) | ||||
| set(CURRENT_CPM_VERSION 0.27.2) | ||||
| 
 | ||||
| if(CPM_DIRECTORY) | ||||
|   if(NOT CPM_DIRECTORY STREQUAL CMAKE_CURRENT_LIST_DIR) | ||||
|  | @ -190,6 +190,8 @@ function(CPMAddPackage) | |||
|     SOURCE_DIR | ||||
|     DOWNLOAD_COMMAND | ||||
|     FIND_PACKAGE_ARGUMENTS | ||||
|     NO_CACHE | ||||
|     GIT_SHALLOW | ||||
|   ) | ||||
| 
 | ||||
|   set(multiValueArgs | ||||
|  | @ -217,7 +219,7 @@ function(CPMAddPackage) | |||
|   endif() | ||||
| 
 | ||||
|   if (DEFINED CPM_ARGS_GITLAB_REPOSITORY) | ||||
|     list(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git") | ||||
|     set(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git") | ||||
|   endif() | ||||
| 
 | ||||
|   if (DEFINED CPM_ARGS_GIT_REPOSITORY) | ||||
|  | @ -229,6 +231,10 @@ function(CPMAddPackage) | |||
| 
 | ||||
|   if (DEFINED CPM_ARGS_GIT_TAG) | ||||
|     list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_TAG ${CPM_ARGS_GIT_TAG}) | ||||
|     # If GIT_SHALLOW is explicitly specified, honor the value. | ||||
|     if (DEFINED CPM_ARGS_GIT_SHALLOW) | ||||
|       list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_SHALLOW ${CPM_ARGS_GIT_SHALLOW}) | ||||
|     endif() | ||||
|   endif() | ||||
| 
 | ||||
|   # Check if package has been added before | ||||
|  | @ -296,7 +302,7 @@ function(CPMAddPackage) | |||
|     list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND ${CPM_ARGS_DOWNLOAD_COMMAND}) | ||||
|   elseif (DEFINED CPM_ARGS_SOURCE_DIR) | ||||
|     list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${CPM_ARGS_SOURCE_DIR}) | ||||
|   elseif (CPM_SOURCE_CACHE) | ||||
|   elseif (CPM_SOURCE_CACHE AND NOT CPM_ARGS_NO_CACHE) | ||||
|     string(TOLOWER ${CPM_ARGS_NAME} lower_case_name) | ||||
|     set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS}) | ||||
|     list(SORT origin_parameters) | ||||
|  | @ -308,6 +314,15 @@ function(CPMAddPackage) | |||
|       list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND "${CMAKE_COMMAND}") | ||||
|       set(PACKAGE_INFO "${download_directory}") | ||||
|     else() | ||||
|       # Enable shallow clone when GIT_TAG is not a commit hash. | ||||
|       # Our guess may not be accurate, but it should guarantee no commit hash get mis-detected. | ||||
|       if (NOT DEFINED CPM_ARGS_GIT_SHALLOW) | ||||
|         cpm_is_git_tag_commit_hash("${CPM_ARGS_GIT_TAG}" IS_HASH) | ||||
|         if (NOT ${IS_HASH}) | ||||
|           list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_SHALLOW TRUE) | ||||
|         endif() | ||||
|       endif() | ||||
| 
 | ||||
|       # remove timestamps so CMake will re-download the dependency | ||||
|       file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/${lower_case_name}-subbuild) | ||||
|       set(PACKAGE_INFO "${PACKAGE_INFO} -> ${download_directory}") | ||||
|  | @ -473,3 +488,18 @@ function(cpm_get_version_from_git_tag GIT_TAG RESULT) | |||
|     SET(${RESULT} ${CMAKE_MATCH_1} PARENT_SCOPE) | ||||
|   endif() | ||||
| endfunction() | ||||
| 
 | ||||
| # guesses if the git tag is a commit hash or an actual tag or a branch nane. | ||||
| function(cpm_is_git_tag_commit_hash GIT_TAG RESULT) | ||||
|   string(LENGTH "${GIT_TAG}" length) | ||||
|   # full hash has 40 characters, and short hash has at least 7 characters. | ||||
|   if (length LESS 7 OR length GREATER 40) | ||||
|     SET(${RESULT} 0 PARENT_SCOPE) | ||||
|   else() | ||||
|     if (${GIT_TAG} MATCHES "^[a-fA-F0-9]+$") | ||||
|       SET(${RESULT} 1 PARENT_SCOPE) | ||||
|     else() | ||||
|       SET(${RESULT} 0 PARENT_SCOPE) | ||||
|     endif() | ||||
|   endif() | ||||
| endfunction() | ||||
|  |  | |||
|  | @ -35,7 +35,7 @@ endif() | |||
| CPMAddPackage( | ||||
|   NAME Format.cmake | ||||
|   GITHUB_REPOSITORY TheLartians/Format.cmake | ||||
|   VERSION 1.3 | ||||
|   VERSION 1.5.2 | ||||
| ) | ||||
| 
 | ||||
| # ---- Create binary ---- | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue