From e2ee88de2ad558b25926c3f286f99b45f1da36e8 Mon Sep 17 00:00:00 2001 From: Brian Hinz Date: Wed, 8 May 2013 00:19:05 +0000 Subject: [PATCH] copy r5088 & 5089 to 1_3 branch git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_3@5094 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- cmake/Modules/CMakeMacroLibtoolFile.cmake | 4 ++-- release/tigervnc.iss.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/CMakeMacroLibtoolFile.cmake b/cmake/Modules/CMakeMacroLibtoolFile.cmake index 0cf7b9fb..0afb7a62 100644 --- a/cmake/Modules/CMakeMacroLibtoolFile.cmake +++ b/cmake/Modules/CMakeMacroLibtoolFile.cmake @@ -101,8 +101,8 @@ macro(libtool_create_control_file _target) # Add custom command to symlink the static library so that autotools finds # the library in .libs. These are executed after the specified target build. add_custom_command(TARGET ${_target} POST_BUILD COMMAND - cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/.libs") + "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/.libs") add_custom_command(TARGET ${_target} POST_BUILD COMMAND - cmake -E create_symlink ${_target_location} "${CMAKE_CURRENT_BINARY_DIR}/.libs/${_lname}${CMAKE_STATIC_LIBRARY_SUFFIX}") + "${CMAKE_COMMAND}" -E create_symlink ${_target_location} "${CMAKE_CURRENT_BINARY_DIR}/.libs/${_lname}${CMAKE_STATIC_LIBRARY_SUFFIX}") endmacro() diff --git a/release/tigervnc.iss.in b/release/tigervnc.iss.in index 21cea320..19768407 100644 --- a/release/tigervnc.iss.in +++ b/release/tigervnc.iss.in @@ -21,7 +21,7 @@ LicenseFile=@CMAKE_SOURCE_DIR@\LICENCE.txt [Files] #ifdef BUILD_WINVNC 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\wm_hooks\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\vncviewer.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; -- 2.39.5