Revision: 5094
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5094&view=rev
Author: bphinz
Date: 2013-05-08 00:19:05 +0000 (Wed, 08 May 2013)
Log Message:
-----------
copy r5088 & 5089 to 1_3 branch
Revision Links:
--------------
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5088&view=rev
Modified Paths:
--------------
branches/1_3/cmake/Modules/CMakeMacroLibtoolFile.cmake
branches/1_3/release/tigervnc.iss.in
Modified: branches/1_3/cmake/Modules/CMakeMacroLibtoolFile.cmake
===================================================================
--- branches/1_3/cmake/Modules/CMakeMacroLibtoolFile.cmake 2013-05-08
00:17:26 UTC (rev 5093)
+++ branches/1_3/cmake/Modules/CMakeMacroLibtoolFile.cmake 2013-05-08
00:19:05 UTC (rev 5094)
@@ -101,8 +101,8 @@
# 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()
Modified: branches/1_3/release/tigervnc.iss.in
===================================================================
--- branches/1_3/release/tigervnc.iss.in 2013-05-08 00:17:26 UTC (rev
5093)
+++ branches/1_3/release/tigervnc.iss.in 2013-05-08 00:19:05 UTC (rev
5094)
@@ -21,7 +21,7 @@
[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;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
