summaryrefslogtreecommitdiffstats
path: root/Source/CPack/WiX
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2018-06-15 17:43:47 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2018-06-21 15:00:28 (GMT)
commit48bc8b2b8226882c44faaf0a043e6fbc004241d1 (patch)
tree0891c05a9ff7e41671786b67e75686e7556b474b /Source/CPack/WiX
parent2a2829cc75be0f8a5d7b48ac79f1f3cd53d8a54a (diff)
downloadCMake-48bc8b2b8226882c44faaf0a043e6fbc004241d1.zip
CMake-48bc8b2b8226882c44faaf0a043e6fbc004241d1.tar.gz
CMake-48bc8b2b8226882c44faaf0a043e6fbc004241d1.tar.bz2
CPack: Move internal implementation modules into Internal/CPack directory
These modules are not meant to be included by user code, they are only an internal implementation detail for CPack. Having them live in the main Modules directory with documentation was misleading, so they have been moved into Modules/Internal/CPack, and their documentation has been stripped following its move into the new "CPack Generators" section. No-op modules which contained only documentation have been removed entirely. The only module that hasn't been moved is CPackIFW, because it contains user-facing macros which would be lost if it were moved. So, the CPackIFW module has been updated with a note explaining what needs to (eventually) happen.
Diffstat (limited to 'Source/CPack/WiX')
-rw-r--r--Source/CPack/WiX/cmCPackWIXGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index e06efda..382b189 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -148,7 +148,7 @@ int cmCPackWIXGenerator::PackageFiles()
bool cmCPackWIXGenerator::InitializeWiXConfiguration()
{
- if (!ReadListFile("CPackWIX.cmake")) {
+ if (!ReadListFile("Internal/CPack/CPackWIX.cmake")) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error while executing CPackWIX.cmake" << std::endl);
return false;