diff options
| author | Pierre Ossman <ossman@cendio.se> | 2011-03-03 12:32:15 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2011-03-03 12:32:15 +0000 |
| commit | 481b03ecd4699056314c2c8661538e8bddfd6265 (patch) | |
| tree | 5c181d18a845de232174727ea08ed892c0c4c0a0 /win | |
| parent | 8fb1191522cc8447a0b9e543056e4c395097e94f (diff) | |
| download | tigervnc-481b03ecd4699056314c2c8661538e8bddfd6265.tar.gz tigervnc-481b03ecd4699056314c2c8661538e8bddfd6265.zip | |
Consolidate all the Windows installer stuff to its own directory.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4316 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win')
| -rw-r--r-- | win/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | win/installer/CMakeLists.txt | 31 | ||||
| -rw-r--r-- | win/installer/tigervnc.iss.in (renamed from win/tigervnc.iss.in) | 0 |
3 files changed, 34 insertions, 0 deletions
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt index 103520aa..ab311aee 100644 --- a/win/CMakeLists.txt +++ b/win/CMakeLists.txt @@ -4,7 +4,10 @@ configure_file(resdefs.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/resdefs.h) add_subdirectory(rfb_win32) add_subdirectory(vncviewer) + if(BUILD_WINVNC) add_subdirectory(vncconfig) add_subdirectory(winvnc) endif() + +add_subdirectory(installer) diff --git a/win/installer/CMakeLists.txt b/win/installer/CMakeLists.txt new file mode 100644 index 00000000..0324fe43 --- /dev/null +++ b/win/installer/CMakeLists.txt @@ -0,0 +1,31 @@ +if(64BIT) + 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() + +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 .) diff --git a/win/tigervnc.iss.in b/win/installer/tigervnc.iss.in index 2d967a45..2d967a45 100644 --- a/win/tigervnc.iss.in +++ b/win/installer/tigervnc.iss.in |