[Cmake-commits] CMake branch, next, updated. v3.0.0-4605-g69ea5f3
Brad King
brad.king at kitware.com
Tue Jul 29 09:32:45 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 69ea5f3e97dff415422b2b6614ddd6d6116b1f52 (commit)
via 56e6975ce98660c86690c5fb97e443402f4885a3 (commit)
via 98ea03443bea81188cfe55a885ac64c3ddd93b40 (commit)
from e9121142e5481e82ab828d164716897d6e82c785 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69ea5f3e97dff415422b2b6614ddd6d6116b1f52
commit 69ea5f3e97dff415422b2b6614ddd6d6116b1f52
Merge: e912114 56e6975
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 29 09:32:44 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 29 09:32:44 2014 -0400
Merge topic 'ExternalProject-add-lzma' into next
56e6975c ExternalProject: Recognize lzma-compressed files (#13515)
98ea0344 ExternalProject: Recognize .tbz2 extension
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56e6975ce98660c86690c5fb97e443402f4885a3
commit 56e6975ce98660c86690c5fb97e443402f4885a3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 23 15:54:04 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 29 09:32:27 2014 -0400
ExternalProject: Recognize lzma-compressed files (#13515)
Add .7z, .tar.xz, and .txz file extensions.
Inspired-by: Joke de Buhr <joke at seiken.de>
Inspired-by: David Cole <DLRdave at aol.com>
diff --git a/Help/release/dev/ExternalProject-add-lzma.rst b/Help/release/dev/ExternalProject-add-lzma.rst
new file mode 100644
index 0000000..cb398ef
--- /dev/null
+++ b/Help/release/dev/ExternalProject-add-lzma.rst
@@ -0,0 +1,5 @@
+ExternalProject-add-lzma
+------------------------
+
+* The :module:`ExternalProject` module learned to support lzma-compressed
+ source tarballs with ``.7z``, ``.tar.xz``, and ``.txz`` extensions.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 8274a53..dbce9f4 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -737,7 +737,7 @@ endfunction()
function(_ep_write_extractfile_script script_filename name filename directory)
set(args "")
- if(filename MATCHES "(\\.|=)(tar\\.bz2|tar\\.gz|tbz2|tgz|zip)$")
+ if(filename MATCHES "(\\.|=)(7z|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$")
set(args xfz)
endif()
@@ -746,7 +746,7 @@ function(_ep_write_extractfile_script script_filename name filename directory)
endif()
if(args STREQUAL "")
- message(SEND_ERROR "error: do not know how to extract '${filename}' -- known types are .tar, .tar.bz2, .tar.gz, .tbz2, .tgz and .zip")
+ message(SEND_ERROR "error: do not know how to extract '${filename}' -- known types are .7z, .tar, .tar.bz2, .tar.gz, .tar.xz, .tbz2, .tgz, .txz and .zip")
return()
endif()
@@ -1540,11 +1540,11 @@ function(_ep_add_download_command name)
if("x${fname}" STREQUAL "x")
string(REGEX MATCH "[^/\\?]*$" fname "${url}")
endif()
- if(NOT "${fname}" MATCHES "(\\.|=)(tar|tar\\.bz2|tar\\.gz|tbz2|tgz|zip)$")
- string(REGEX MATCH "([^/\\?]+(\\.|=)(tar|tar\\.bz2|tar\\.gz|tbz2|tgz|zip))/.*$" match_result "${url}")
+ if(NOT "${fname}" MATCHES "(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$")
+ string(REGEX MATCH "([^/\\?]+(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip))/.*$" match_result "${url}")
set(fname "${CMAKE_MATCH_1}")
endif()
- if(NOT "${fname}" MATCHES "(\\.|=)(tar|tar\\.bz2|tar\\.gz|tbz2|tgz|zip)$")
+ if(NOT "${fname}" MATCHES "(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$")
message(FATAL_ERROR "Could not extract tarball filename from url:\n ${url}")
endif()
string(REPLACE ";" "-" fname "${fname}")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98ea03443bea81188cfe55a885ac64c3ddd93b40
commit 98ea03443bea81188cfe55a885ac64c3ddd93b40
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 23 15:52:51 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 29 09:29:57 2014 -0400
ExternalProject: Recognize .tbz2 extension
Also fix .bz2 extension to be .tar.bz2 since we only support compressed
tarballs and not plain compressed files.
Suggested-by: Nils Gladitz <nilsgladitz at gmail.com>
Suggested-by: Rolf Eike Beer <eike at sf-mail.de>
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0d35cca..8274a53 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -737,7 +737,7 @@ endfunction()
function(_ep_write_extractfile_script script_filename name filename directory)
set(args "")
- if(filename MATCHES "(\\.|=)(bz2|tar\\.gz|tgz|zip)$")
+ if(filename MATCHES "(\\.|=)(tar\\.bz2|tar\\.gz|tbz2|tgz|zip)$")
set(args xfz)
endif()
@@ -746,7 +746,7 @@ function(_ep_write_extractfile_script script_filename name filename directory)
endif()
if(args STREQUAL "")
- message(SEND_ERROR "error: do not know how to extract '${filename}' -- known types are .bz2, .tar, .tar.gz, .tgz and .zip")
+ message(SEND_ERROR "error: do not know how to extract '${filename}' -- known types are .tar, .tar.bz2, .tar.gz, .tbz2, .tgz and .zip")
return()
endif()
@@ -1540,11 +1540,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 "(\\.|=)(tar|tar\\.bz2|tar\\.gz|tbz2|tgz|zip)$")
+ string(REGEX MATCH "([^/\\?]+(\\.|=)(tar|tar\\.bz2|tar\\.gz|tbz2|tgz|zip))/.*$" match_result "${url}")
set(fname "${CMAKE_MATCH_1}")
endif()
- if(NOT "${fname}" MATCHES "(\\.|=)(bz2|tar|tgz|tar\\.gz|zip)$")
+ if(NOT "${fname}" MATCHES "(\\.|=)(tar|tar\\.bz2|tar\\.gz|tbz2|tgz|zip)$")
message(FATAL_ERROR "Could not extract tarball filename from url:\n ${url}")
endif()
string(REPLACE ";" "-" fname "${fname}")
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/ExternalProject-add-lzma.rst | 5 +++++
Modules/ExternalProject.cmake | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 Help/release/dev/ExternalProject-add-lzma.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list