From c67db65070d74f86f55705547907d3d288a763db Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 8 Nov 2011 08:51:04 +0000 Subject: [PATCH] We don't need BUILD_DIR anymore since we divorced Visual Studio git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4776 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- cmake/BuildPackages.cmake | 2 +- release/tigervnc.iss.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/BuildPackages.cmake b/cmake/BuildPackages.cmake index 33043a31..23cb0541 100644 --- a/cmake/BuildPackages.cmake +++ b/cmake/BuildPackages.cmake @@ -29,7 +29,7 @@ endif() configure_file(release/tigervnc.iss.in release/tigervnc.iss) add_custom_target(installer - iscc -o. ${INST_DEFS} -DBUILD_DIR= -F${INST_NAME} release/tigervnc.iss + iscc -o. ${INST_DEFS} -F${INST_NAME} release/tigervnc.iss DEPENDS ${INST_DEPS} SOURCES release/tigervnc.iss) diff --git a/release/tigervnc.iss.in b/release/tigervnc.iss.in index 71632b13..21cea320 100644 --- a/release/tigervnc.iss.in +++ b/release/tigervnc.iss.in @@ -20,11 +20,11 @@ LicenseFile=@CMAKE_SOURCE_DIR@\LICENCE.txt [Files] #ifdef BUILD_WINVNC -Source: "@CMAKE_CURRENT_BINARY_DIR@\win\winvnc\{#BUILD_DIR}winvnc4.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; -Source: "@CMAKE_CURRENT_BINARY_DIR@\win\winvnc\{#BUILD_DIR}wm_hooks.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; -Source: "@CMAKE_CURRENT_BINARY_DIR@\win\vncconfig\{#BUILD_DIR}vncconfig.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; +Source: "@CMAKE_CURRENT_BINARY_DIR@\win\winvnc\winvnc4.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; +Source: "@CMAKE_CURRENT_BINARY_DIR@\win\winvnc\wm_hooks.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; +Source: "@CMAKE_CURRENT_BINARY_DIR@\win\vncconfig\vncconfig.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; #endif -Source: "@CMAKE_CURRENT_BINARY_DIR@\vncviewer\{#BUILD_DIR}vncviewer.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; +Source: "@CMAKE_CURRENT_BINARY_DIR@\vncviewer\vncviewer.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Source: "@CMAKE_SOURCE_DIR@\README.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "@CMAKE_SOURCE_DIR@\LICENCE.TXT"; DestDir: "{app}"; Flags: ignoreversion -- 2.39.5