mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 08:08:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cpack-debian-multiarch'

Browse Source 
71c631c435 CPack/DEB: Add Multi-Arch support
55524c48a4 CPack/DEB: Add Multi-Arch support
a022705a2e Tests/RunCMake/CPack: Improve README

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9609
This commit is contained in:
Brad King
2024-06-26 12:43:45 +00:00
committed by Kitware Robot
parent 0ffdd6b50f 71c631c435
commit a20377e41a
11 changed files with 71 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/cmCPackDebGenerator.cxx
+15
View File
@@ -789,6 +789,21 @@ bool cmCPackDebGenerator::createDeb()
if (cmNonempty(debian_pkg_replaces)) {
controlValues["Replaces"] = *debian_pkg_replaces;
}
cmValue debian_pkg_multiarch =
this->GetOption("GEN_CPACK_DEBIAN_PACKAGE_MULTIARCH");
if (cmNonempty(debian_pkg_multiarch)) {
// check for valid values: same, foreign, allowed
if (*debian_pkg_multiarch != "same" &&
*debian_pkg_multiarch != "foreign" &&
*debian_pkg_multiarch != "allowed") {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error: invalid value for Multi-Arch: "
<< *debian_pkg_multiarch
<< ". Valid values are: same, foreign, allowed\n");
return false;
}
controlValues["Multi-Arch"] = *debian_pkg_multiarch;
}
const std::string strGenWDIR(this->GetOption("GEN_WDIR"));
const std::string shlibsfilename = strGenWDIR + "/shlibs";