From d22efe47813c8edc63a9d2acfb7a987f3990b2d2 Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Fri, 24 Jun 2011 05:26:43 +0000
Subject: [PATCH] Installer needs to be built from the top-level CMake context.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4535 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 CMakeLists.txt                                         | 1 +
 win/CMakeLists.txt                                     | 2 --
 win/installer/{CMakeLists.txt => BuildInstaller.cmake} | 5 ++++-
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename win/installer/{CMakeLists.txt => BuildInstaller.cmake} (83%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32917eaa..081eaea1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,6 +309,7 @@ add_subdirectory(common)
 
 if(WIN32)
   add_subdirectory(win)
+  include(win/installer/BuildInstaller.cmake)
 else()
   # No interest in building x related parts on Apple
   if(NOT APPLE)
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
index 0bd5a3a4..61afe4d7 100644
--- a/win/CMakeLists.txt
+++ b/win/CMakeLists.txt
@@ -12,5 +12,3 @@ if(BUILD_WINVNC)
 add_subdirectory(vncconfig)
 add_subdirectory(winvnc)
 endif()
-
-add_subdirectory(installer)
diff --git a/win/installer/CMakeLists.txt b/win/installer/BuildInstaller.cmake
similarity index 83%
rename from win/installer/CMakeLists.txt
rename to win/installer/BuildInstaller.cmake
index 56f52a21..dfb44e8c 100644
--- a/win/installer/CMakeLists.txt
+++ b/win/installer/BuildInstaller.cmake
@@ -1,3 +1,6 @@
+# This file is included from the top-level CMakeLists.txt.  We just store it
+# here to avoid cluttering up that file.
+
 # Detect a 64-bit build and give that installer a different name
 if(CMAKE_SIZEOF_VOID_P MATCHES 8)
   set(INST_NAME ${CMAKE_PROJECT_NAME}64-${VERSION})
@@ -25,7 +28,7 @@ if(GNUTLS_FOUND)
   set(INST_DEFS ${INST_DEFS} -DHAVE_GNUTLS)
 endif()
 
-configure_file(tigervnc.iss.in tigervnc.iss)
+configure_file(win/installer/tigervnc.iss.in tigervnc.iss)
 
 add_custom_target(installer
   iscc -o${INSTALLERDIR} ${INST_DEFS} ${BUILDDIRDEF} -F${INST_NAME} tigervnc.iss
-- 
2.39.5