Skip to content
Snippets Groups Projects

Draft: Merge the latest contrib installation into master

Closed Dmitri Konstantinov requested to merge merge_contrib into master
Compare and
42 files
+ 943
88
Compare changes
  • Side-by-side
  • Inline
Files
42
@@ -621,6 +621,10 @@ function(_ep_write_extractfile_script script_filename name filename directory)
set(args xfz)
endif()
if(filename MATCHES "(\\.|=)tar\\.xz$")
set(args xfJ)
endif()
if(filename MATCHES "(\\.|=)tar$")
set(args xf)
endif()
@@ -1243,6 +1247,11 @@ function(_ep_add_download_command name)
set(comment)
set(work_dir)
set(REPOSITORY_INFO_DIR Modules)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.25)
set(REPOSITORY_INFO_DIR Modules/ExternalProject)
endif()
if(cmd_set)
set(work_dir ${download_dir})
elseif(cvs_repository)
@@ -1262,7 +1271,7 @@ function(_ep_add_download_command name)
set(module ${cvs_module})
set(tag ${cvs_tag})
configure_file(
"${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
"${CMAKE_ROOT}/${REPOSITORY_INFO_DIR}/RepositoryInfo.txt.in"
"${stamp_dir}/${name}-cvsinfo.txt"
@ONLY
)
@@ -1287,7 +1296,7 @@ function(_ep_add_download_command name)
set(module)
set(tag ${svn_revision})
configure_file(
"${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
"${CMAKE_ROOT}/${REPOSITORY_INFO_DIR}/RepositoryInfo.txt.in"
"${stamp_dir}/${name}-svninfo.txt"
@ONLY
)
@@ -1336,7 +1345,7 @@ function(_ep_add_download_command name)
set(module)
set(tag)
configure_file(
"${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
"${CMAKE_ROOT}/${REPOSITORY_INFO_DIR}/RepositoryInfo.txt.in"
"${stamp_dir}/${name}-gitinfo.txt"
@ONLY
)
@@ -1376,7 +1385,7 @@ function(_ep_add_download_command name)
set(module)
set(tag)
configure_file(
"${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
"${CMAKE_ROOT}/${REPOSITORY_INFO_DIR}/RepositoryInfo.txt.in"
"${stamp_dir}/${name}-hginfo.txt"
@ONLY
)
@@ -1414,7 +1423,7 @@ function(_ep_add_download_command name)
set(module "${url}")
set(tag "${hash}")
configure_file(
"${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
"${CMAKE_ROOT}/${REPOSITORY_INFO_DIR}/RepositoryInfo.txt.in"
"${stamp_dir}/${name}-urlinfo.txt"
@ONLY
)
@@ -1430,11 +1439,11 @@ function(_ep_add_download_command name)
if("x${fname}" STREQUAL "x")
string(REGEX MATCH "[^/\\?]*$" fname "${url}")
endif()
if(NOT "${fname}" MATCHES "(\\.|=)(bz2|tar|tgz|tar\\.gz|zip)$")
string(REGEX MATCH "([^/\\?]+(\\.|=)(bz2|tar|tgz|tar\\.gz|zip))/.*$" match_result "${url}")
if(NOT "${fname}" MATCHES "(\\.|=)(bz2|tar|tgz|tar\\.gz|zip|tar\\.xz)$")
string(REGEX MATCH "([^/\\?]+(\\.|=)(bz2|tar|tgz|tar\\.gz|zip|tar\\.xz))/.*$" match_result "${url}")
set(fname "${CMAKE_MATCH_1}")
endif()
if(NOT "${fname}" MATCHES "(\\.|=)(bz2|tar|tgz|tar\\.gz|zip)$")
if(NOT "${fname}" MATCHES "(\\.|=)(bz2|tar|tgz|tar\\.gz|zip|tar\\.xz)$")
message(FATAL_ERROR "Could not extract tarball filename from url:\n ${url}")
endif()
string(REPLACE ";" "-" fname "${fname}")
Loading