diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-05 13:31:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-05-05 13:31:46 (GMT) |
| commit | 7d78dcbebbb028c17de38e337942e0df061c6f20 (patch) | |
| tree | 52455f6fd669dfb942b3718011f7a7bdf60e2c2d /Source/CPack | |
| parent | cd20592c6db8437aa74c8e3060b2eec687d84525 (diff) | |
| parent | cae7e5e38df6035779f1de473cf3debbc4a9260f (diff) | |
| download | CMake-7d78dcbebbb028c17de38e337942e0df061c6f20.zip CMake-7d78dcbebbb028c17de38e337942e0df061c6f20.tar.gz CMake-7d78dcbebbb028c17de38e337942e0df061c6f20.tar.bz2 | |
Merge topic 'cpack-wix-arch'
cae7e5e38d CPack/WIX: Add CPACK_WIX_ARCHITECTURE to support Windows for ARM installers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7236
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 6a0095b..594f408 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -89,10 +89,21 @@ bool cmCPackWIXGenerator::RunCandleCommand(std::string const& sourceFile, return false; } + std::string arch; + if (cmValue archOpt = GetOption("CPACK_WIX_ARCHITECTURE")) { + arch = *archOpt; + } else { + arch = GetArchitecture(); + cmCPackLogger( + cmCPackLog::LOG_VERBOSE, + "CPACK_WIX_ARCHITECTURE was not set. Invoking WiX with architecture " + << arch << " . " << std::endl); + } + std::ostringstream command; command << QuotePath(executable); command << " -nologo"; - command << " -arch " << GetArchitecture(); + command << " -arch " << arch; command << " -out " << QuotePath(objectFile); for (std::string const& ext : CandleExtensions) { |