From 30768207b3d7da7ddf3dbaea1b160a2c90ecd17e Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Thu, 9 Feb 2017 16:42:29 +0000 Subject: [PATCH] Move WiX installer project to new dist directory --- CMakeLists.txt | 14 ++++++++------ {src/setup/win32 => dist/wix}/Include.wxi.in | 0 {src/setup/win32 => dist/wix}/Product.wxs | 0 {src/setup/win32 => dist/wix}/Synergy.sln | 0 {src/setup/win32 => dist/wix}/Synergy.wixproj | 0 5 files changed, 8 insertions(+), 6 deletions(-) rename {src/setup/win32 => dist/wix}/Include.wxi.in (100%) rename {src/setup/win32 => dist/wix}/Product.wxs (100%) rename {src/setup/win32 => dist/wix}/Synergy.sln (100%) rename {src/setup/win32 => dist/wix}/Synergy.wixproj (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 990d2684..e4050a86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -352,14 +352,16 @@ if (CONF_DOXYGEN) endif() -configure_file (src/setup/win32/Include.wxi.in - "${CMAKE_BINARY_DIR}/setup/Include.wxi" NEWLINE_STYLE WIN32) +if (WIN32) + configure_file (dist/wix/Include.wxi.in + "${CMAKE_BINARY_DIR}/dist/wix/Include.wxi" NEWLINE_STYLE WIN32) -configure_file (src/setup/win32/Product.wxs - "${CMAKE_BINARY_DIR}/setup/Product.wxs" COPYONLY) + configure_file (dist/wix/Product.wxs + "${CMAKE_BINARY_DIR}/dist/wix/Product.wxs" COPYONLY) -configure_file (src/setup/win32/Synergy.wixproj - "${CMAKE_BINARY_DIR}/setup/Synergy.wixproj" COPYONLY) + configure_file (dist/wix/Synergy.wixproj + "${CMAKE_BINARY_DIR}/dist/wix/Synergy.wixproj" COPYONLY) +endif() option(SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON) diff --git a/src/setup/win32/Include.wxi.in b/dist/wix/Include.wxi.in similarity index 100% rename from src/setup/win32/Include.wxi.in rename to dist/wix/Include.wxi.in diff --git a/src/setup/win32/Product.wxs b/dist/wix/Product.wxs similarity index 100% rename from src/setup/win32/Product.wxs rename to dist/wix/Product.wxs diff --git a/src/setup/win32/Synergy.sln b/dist/wix/Synergy.sln similarity index 100% rename from src/setup/win32/Synergy.sln rename to dist/wix/Synergy.sln diff --git a/src/setup/win32/Synergy.wixproj b/dist/wix/Synergy.wixproj similarity index 100% rename from src/setup/win32/Synergy.wixproj rename to dist/wix/Synergy.wixproj