mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

CPack/WiX: Add the build directory to IncludeSearchPaths for wix.exe

Browse Source 
In commit f2134169f6 (WiX: Add the build directory to IncludeSearchPaths
for candle.exe, 2018-07-06, v3.13.0-rc1~318^2) we implemented this for
WiX v3 with `candle.exe`.  Use the same mechanism for Wix v4 and upwards
for `wix.exe`.
This commit is contained in:
Julian Greilich
2025-05-23 11:04:10 +02:00
committed by Brad King
parent a86eaf98f7
commit 900897b510
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CPack/WiX/cmCPackWIXGenerator.cxx
View File

@@ -334,8 +334,13 @@ bool cmCPackWIXGenerator::PackageWithWix()
AddCustomFlags("CPACK_WIX_BUILD_EXTRA_FLAGS", command); AddCustomFlags("CPACK_WIX_BUILD_EXTRA_FLAGS", command);
bool includeCPackTopLevel = false;
for (std::string const& sourceFilename : this->WixSources) { for (std::string const& sourceFilename : this->WixSources) {
command << " -src " << QuotePath(CMakeToWixPath(sourceFilename)); command << " -src " << QuotePath(CMakeToWixPath(sourceFilename));
includeCPackTopLevel |= !cmHasPrefix(sourceFilename, this->CPackTopLevel);
}
if (includeCPackTopLevel) {
command << " -i " << QuotePath(this->CPackTopLevel);
} }
return RunWiXCommand(command.str()); return RunWiXCommand(command.str());