From: DRC <dcommander@users.sourceforge.net>
Date: Fri, 24 Jun 2011 05:26:43 +0000 (+0000)
Subject: Installer needs to be built from the top-level CMake context.
X-Git-Tag: v1.1.90~251
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d22efe47813c8edc63a9d2acfb7a987f3990b2d2;p=tigervnc.git

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

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/BuildInstaller.cmake b/win/installer/BuildInstaller.cmake
new file mode 100644
index 00000000..dfb44e8c
--- /dev/null
+++ b/win/installer/BuildInstaller.cmake
@@ -0,0 +1,39 @@
+# 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})
+  set(INST_DEFS -DWIN64)
+else()
+  set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
+endif()
+
+if(MSVC_IDE)
+  set(INSTALLERDIR "$(OutDir)")
+  set(BUILDDIRDEF "-DBUILD_DIR=${INSTALLERDIR}\\")
+else()
+  set(INSTALLERDIR .)
+  set(BUILDDIRDEF "-DBUILD_DIR=")
+endif()
+
+set(INST_DEPS vncviewer)
+
+if(BUILD_WINVNC)
+  set(INST_DEFS ${INST_DEFS} -DBUILD_WINVNC)
+  set(INST_DEPS ${INST_DEPS} winvnc4 wm_hooks vncconfig)
+endif()
+
+if(GNUTLS_FOUND)
+  set(INST_DEFS ${INST_DEFS} -DHAVE_GNUTLS)
+endif()
+
+configure_file(win/installer/tigervnc.iss.in tigervnc.iss)
+
+add_custom_target(installer
+  iscc -o${INSTALLERDIR} ${INST_DEFS} ${BUILDDIRDEF} -F${INST_NAME} tigervnc.iss
+  DEPENDS ${INST_DEPS}
+  SOURCES tigervnc.iss)
+
+install(FILES ${CMAKE_SOURCE_DIR}/win/README_BINARY.txt
+  ${CMAKE_SOURCE_DIR}/LICENCE.txt DESTINATION .)
diff --git a/win/installer/CMakeLists.txt b/win/installer/CMakeLists.txt
deleted file mode 100644
index 56f52a21..00000000
--- a/win/installer/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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})
-  set(INST_DEFS -DWIN64)
-else()
-  set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
-endif()
-
-if(MSVC_IDE)
-  set(INSTALLERDIR "$(OutDir)")
-  set(BUILDDIRDEF "-DBUILD_DIR=${INSTALLERDIR}\\")
-else()
-  set(INSTALLERDIR .)
-  set(BUILDDIRDEF "-DBUILD_DIR=")
-endif()
-
-set(INST_DEPS vncviewer)
-
-if(BUILD_WINVNC)
-  set(INST_DEFS ${INST_DEFS} -DBUILD_WINVNC)
-  set(INST_DEPS ${INST_DEPS} winvnc4 wm_hooks vncconfig)
-endif()
-
-if(GNUTLS_FOUND)
-  set(INST_DEFS ${INST_DEFS} -DHAVE_GNUTLS)
-endif()
-
-configure_file(tigervnc.iss.in tigervnc.iss)
-
-add_custom_target(installer
-  iscc -o${INSTALLERDIR} ${INST_DEFS} ${BUILDDIRDEF} -F${INST_NAME} tigervnc.iss
-  DEPENDS ${INST_DEPS}
-  SOURCES tigervnc.iss)
-
-install(FILES ${CMAKE_SOURCE_DIR}/win/README_BINARY.txt
-  ${CMAKE_SOURCE_DIR}/LICENCE.txt DESTINATION .)