From 61f7536e2259dc496211dfca21b2a0e4eef3d9f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Janouch?=
Date: Wed, 28 Jan 2015 00:16:41 +0100
Subject: Fix to work on Windows XP
---
Win32Depends.cmake | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
(limited to 'Win32Depends.cmake')
diff --git a/Win32Depends.cmake b/Win32Depends.cmake
index a4b07e5..61347da 100644
--- a/Win32Depends.cmake
+++ b/Win32Depends.cmake
@@ -1,5 +1,8 @@
# Usage: cmake -P Win32Depends.cmake
+# Only CMake 3.1+ supports XZ archives and 7z doesn't also untar automatically
+cmake_minimum_required (VERSION 3.1)
+
# Directories
set (working_dir ${CMAKE_CURRENT_BINARY_DIR}/win32-depends)
set (pkg_dir ${working_dir}/packages)
@@ -123,13 +126,13 @@ foreach (pkg_set ${pkg_list})
get_filename_component (filename ${url} NAME)
message (STATUS "Extracting ${filename}...")
- if (filename MATCHES "7z$")
+ if (filename MATCHES "\\.7z$")
set (extract_command ${sevenzip_executable} x)
set (quiet OUTPUT_QUIET)
- else (filename MATCHES "7z$")
+ else (filename MATCHES "\\.7z$")
set (extract_command ${CMAKE_COMMAND} -E tar xf)
set (quiet)
- endif (filename MATCHES "7z$")
+ endif (filename MATCHES "\\.7z$")
set (filename ${pkg_dir}/${filename})
if (pkg_${pkg_set}_strip)
--
cgit v1.2.3