diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-10 13:49:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-02-10 13:49:33 (GMT) |
| commit | 6bd277d2c15201962c2774d71f326a6918f56231 (patch) | |
| tree | 1809da70b56e0164430cf082e2dcf755e9523d36 /Utilities/CMakeLists.txt | |
| parent | 7540deb185a40ddfbac759f8027df74c2a8569c3 (diff) | |
| parent | a12b0f1b193024b71583b9150aeead33d364d189 (diff) | |
| download | CMake-6bd277d2c15201962c2774d71f326a6918f56231.zip CMake-6bd277d2c15201962c2774d71f326a6918f56231.tar.gz CMake-6bd277d2c15201962c2774d71f326a6918f56231.tar.bz2 | |
Merge topic 'wix-prevent-nsis-overwrite'
a12b0f1b CMake: Prevent WiX installations over existing NSIS installations
Diffstat (limited to 'Utilities/CMakeLists.txt')
| -rw-r--r-- | Utilities/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 8b3e325..cf6bb72 100644 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -33,3 +33,7 @@ else() # Normal documentation build. add_subdirectory(Sphinx) endif() + +if(WIX_CUSTOM_ACTION_ENABLED) + add_subdirectory(Release/WiX) +endif() |