|
From: <ai...@us...> - 2013-12-19 19:13:35
|
Revision: 12888
http://sourceforge.net/p/plplot/code/12888
Author: airwin
Date: 2013-12-19 19:13:32 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
I have just proved CMake 2.8.11.2 can unpack *.xz archives using the
cmake -E tar zxf *.xz
command. Therefore, drop using a system tar workaround for this
special case which reduces the differences between the epa_build
version of ExternalProject.cmake and the CMake version (which is
a good direction to go because eventually we may be able to
completely drop the epa_build variant of ExternalProject.cmake
Modified Paths:
--------------
trunk/cmake/epa_build/ExternalProject.cmake
Modified: trunk/cmake/epa_build/ExternalProject.cmake
===================================================================
--- trunk/cmake/epa_build/ExternalProject.cmake 2013-12-19 17:24:09 UTC (rev 12887)
+++ trunk/cmake/epa_build/ExternalProject.cmake 2013-12-19 19:13:32 UTC (rev 12888)
@@ -636,18 +636,9 @@
# Extract it:
#
message(STATUS \"extracting... [tar ${args}]\")
-if(filename MATCHES \"tar\\\\.xz$\")
- # --force-local required so that drive-letter colon for filename on
- # Windows platforms is not interpreted as a remote host.
- find_program(TAR_EXECUTABLE tar)
- execute_process(COMMAND \${TAR_EXECUTABLE} --force-local -Jxf \${filename}
- WORKING_DIRECTORY \${ut_dir}
- RESULT_VARIABLE rv)
-else(filename MATCHES \"tar\\\\.xz$\")
- execute_process(COMMAND \${CMAKE_COMMAND} -E tar ${args} \${filename}
- WORKING_DIRECTORY \${ut_dir}
- RESULT_VARIABLE rv)
-endif(filename MATCHES \"tar\\\\.xz$\")
+execute_process(COMMAND \${CMAKE_COMMAND} -E tar ${args} \${filename}
+ WORKING_DIRECTORY \${ut_dir}
+ RESULT_VARIABLE rv)
if(NOT rv EQUAL 0)
message(STATUS \"extracting... [error clean up]\")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|