From 7d3531e3c2d2ecd638b84e20bdb45b3adec99c83 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Wed, 8 Feb 2017 00:43:16 +0000 Subject: [PATCH] Copy WiX setup files to build directory --- CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3ffc807..f4db4930 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -317,8 +317,6 @@ if (UNIX) endif() endif() -add_subdirectory(src) - if (WIN32) # TODO: consider using /analyze to uncover potential bugs in the source code. @@ -356,6 +354,14 @@ if (CONF_DOXYGEN) endif() configure_file (src/setup/win32/Include.wxi.in - "${CMAKE_BINARY_DIR}/setup/Include.wxi" NEWLINE_STYLE WIN32) + "${CMAKE_BINARY_DIR}/setup/Include.wxi" NEWLINE_STYLE WIN32) + +configure_file (src/setup/win32/Product.wxs + "${CMAKE_BINARY_DIR}/setup/Product.wxs" COPYONLY) + +configure_file (src/setup/win32/Synergy.wixproj + "${CMAKE_BINARY_DIR}/setup/Synergy.wixproj" COPYONLY) option(SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON) + +add_subdirectory(src)