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

@@ -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)

win/CMakeLists.txt

@@ -12,5 +12,3 @@ if(BUILD_WINVNC)
 add_subdirectory(vncconfig)
 add_subdirectory(winvnc)
 endif()
-
-add_subdirectory(installer)

win/installer/CMakeLists.txt → 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