diff options
author | Nils Gladitz <nilsgladitz@gmail.com> | 2015-03-06 19:40:53 (GMT) |
---|---|---|
committer | Nils Gladitz <nilsgladitz@gmail.com> | 2015-03-06 20:06:42 (GMT) |
commit | b0852ebc09eec44041e8aa624ec4bb17bda14dac (patch) | |
tree | 1cae1d773fb419b1fb8f5c63fba0bb4e2faf371d | |
parent | 8f38b8a4433b26da8f64b705fa82e520c40106d5 (diff) | |
download | CMake-b0852ebc09eec44041e8aa624ec4bb17bda14dac.zip CMake-b0852ebc09eec44041e8aa624ec4bb17bda14dac.tar.gz CMake-b0852ebc09eec44041e8aa624ec4bb17bda14dac.tar.bz2 |
CPackWIX: Support patching of root <Feature> elements.
-rw-r--r-- | Modules/CPackWIX.cmake | 6 | ||||
-rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake index 105df96..5fe51a6 100644 --- a/Modules/CPackWIX.cmake +++ b/Modules/CPackWIX.cmake @@ -148,8 +148,10 @@ # Currently fragments can be injected into most # Component, File and Directory elements. # -# The special Id ``#PRODUCT`` can be used to inject content -# into the ``<Product>`` element. +# The following additional special Ids can be used: +# +# * ``#PRODUCT`` for the ``<Product>`` element. +# * ``#PRODUCTFEATURE`` for the root ``<Feature>`` element. # # The following example illustrates how this works. # diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 4b8daf8..13edde3 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -474,6 +474,7 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles() featureDefinitions.AddAttribute("Title", cpackPackageName); featureDefinitions.AddAttribute("Level", "1"); + this->Patch->ApplyFragment("#PRODUCTFEATURE", featureDefinitions); const char* package = GetOption("CPACK_WIX_CMAKE_PACKAGE_REGISTRY"); if(package) |