From a12b0f1b193024b71583b9150aeead33d364d189 Mon Sep 17 00:00:00 2001 From: Nils Gladitz Date: Sun, 7 Feb 2016 20:25:56 +0100 Subject: CMake: Prevent WiX installations over existing NSIS installations Use a custom action to look for Uninstall.exe in the user selected installation prefix. Its presence indicates a previous NSIS installation. Inform the user and request manual resolution of the issue. --- Utilities/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Utilities/CMakeLists.txt') diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 8b3e325fa0..cf6bb72852 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() -- cgit v1.2.1