aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2014-11-08 05:43:17 -0500
committerJohn Szakmeister <john@szakmeister.net>2014-11-08 05:43:17 -0500
commit5d0f8b63e344c13ae32d43389e22537aa8e3da4d (patch)
treebc9d9e2c44cc521f6bfae7b68bedf0919f6d04b0
parent847d5ffa7c21321765df1021465a20a96de8bfef (diff)
downloadrneovim-5d0f8b63e344c13ae32d43389e22537aa8e3da4d.tar.gz
rneovim-5d0f8b63e344c13ae32d43389e22537aa8e3da4d.tar.bz2
rneovim-5d0f8b63e344c13ae32d43389e22537aa8e3da4d.zip
Revert "build: don't download and extract tarball if source is already present"
This reverts commit 90658982644b76a9e8e4abfbcd16450df26b0a32. It failed to work correctly on a fresh clone. See #1433.
-rw-r--r--third-party/cmake/DownloadAndExtractFile.cmake11
1 files changed, 2 insertions, 9 deletions
diff --git a/third-party/cmake/DownloadAndExtractFile.cmake b/third-party/cmake/DownloadAndExtractFile.cmake
index 43100c0431..14873793d9 100644
--- a/third-party/cmake/DownloadAndExtractFile.cmake
+++ b/third-party/cmake/DownloadAndExtractFile.cmake
@@ -18,15 +18,6 @@ if(NOT DEFINED TARGET)
message(FATAL_ERROR "TARGET must be defined.")
endif()
-set(SRC_DIR ${PREFIX}/src/${TARGET})
-
-# Check whether the source has been downloaded. If true, skip it.
-# Useful for external downloads like homebrew.
-if(EXISTS "${SRC_DIR}" AND IS_DIRECTORY "${SRC_DIR}")
- message(STATUS "${SRC_DIR} is found, skipping download and extraction. ")
- return()
-endif()
-
# Taken from ExternalProject_Add. Let's hope we can drop this one day when
# ExternalProject_Add allows you to disable SHOW_PROGRESS on the file download.
if(TIMEOUT)
@@ -80,6 +71,8 @@ endif()
message(STATUS "downloading... done")
+set(SRC_DIR ${PREFIX}/src/${TARGET})
+
# Slurped from a generated extract-TARGET.cmake file.
message(STATUS "extracting...
src='${file}'