diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-13 12:57:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-13 12:57:09 (GMT) |
| commit | f691dbc4858710708ec764a942c8f25425324a7f (patch) | |
| tree | 4a79742925cfa69551e1d32a1df5f31d751f8a01 | |
| parent | 969ad5b33e365d447642d2bf114ca6bd5667e257 (diff) | |
| parent | f2134169f61e12354c79cd818758d34257116b1c (diff) | |
| download | CMake-f691dbc4858710708ec764a942c8f25425324a7f.zip CMake-f691dbc4858710708ec764a942c8f25425324a7f.tar.gz CMake-f691dbc4858710708ec764a942c8f25425324a7f.tar.bz2 | |
Merge topic 'cpack-wix-extra-sources'
f2134169f6 WiX: Add the build directory to IncludeSearchPaths for candle.exe
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2194
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 382b189..398ebd3 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -100,6 +100,10 @@ bool cmCPackWIXGenerator::RunCandleCommand(std::string const& sourceFile, command << " -ext " << QuotePath(ext); } + if (sourceFile.rfind(this->CPackTopLevel, 0) != 0) { + command << " " << QuotePath("-I" + this->CPackTopLevel); + } + AddCustomFlags("CPACK_WIX_CANDLE_EXTRA_FLAGS", command); command << " " << QuotePath(sourceFile); |