Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games/warzone2100: switch from p7zip to 7-zip
PR: 261700 Reported by: makc
- Loading branch information
Showing
2 changed files
with
23 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
--- cmake/FindZIP.cmake.orig 2021-04-18 18:28:41 UTC | ||
+++ cmake/FindZIP.cmake | ||
@@ -29,8 +29,8 @@ set(_PF32BIT "ProgramFiles(x86)") | ||
# | ||
|
||
# Search for 7-Zip | ||
-find_program(ZIP_EXECUTABLE NAMES 7z 7za PATHS "$ENV{ProgramFiles}/7-Zip" "$ENV{${_PF32BIT}}/7-Zip" "$ENV{ProgramW6432}/7-Zip") | ||
-if(ZIP_EXECUTABLE MATCHES "7z|7za") | ||
+find_program(ZIP_EXECUTABLE NAMES 7zz REQUIRED) | ||
+if(ZIP_EXECUTABLE MATCHES "7zz") | ||
# Test whether 7-Zip supports the "-bb0" option to disable log output | ||
execute_process(COMMAND ${ZIP_EXECUTABLE} i -bb0 | ||
RESULT_VARIABLE 7z_bb_result | ||
@@ -110,7 +110,7 @@ function(COMPRESS_ZIP) | ||
message( FATAL_ERROR "Unsupported compression level \"${_parsedArguments_COMPRESSION_LEVEL}\" (must be: 0, 1, 3, 5, 7, 9)" ) | ||
endif() | ||
|
||
- if(ZIP_EXECUTABLE MATCHES "7z|7za") | ||
+ if(ZIP_EXECUTABLE MATCHES "7zz") | ||
set(_zipExecutableOptions a -tzip -mtc=off) | ||
if(DEFINED _parsedArguments_COMPRESSION_LEVEL) | ||
# 7z command-line option for compression level (when in ZIP mode) is: "-mx=#" |