From 60e27dea9cf53fdb9919471cf6a82877a7d37577 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Tue, 31 Aug 2021 01:11:45 -0600 Subject: [PATCH] Meta: Require unzip and tar explicitly in CMakeLists This should help stem the tide of people hopping in the build problems channel on discord because they don't have unzip installed. --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16dc2e185ca..17e982b1771 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,6 +155,11 @@ if(CCACHE_PROGRAM) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") endif() +# FIXME: With cmake 3.18, we can change unzip/untar steps to use +# file(ARCHIVE_EXTRACT) instead +find_program(UNZIP unzip REQUIRED) +find_program(TAR tar REQUIRED) + unset(CMAKE_SYSROOT) set(CMAKE_STAGING_PREFIX ${CMAKE_BINARY_DIR}/Root) set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/Root)