[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tigervnc-commits
Subject:    [Tigervnc-commits] SF.net SVN: tigervnc:[5093] tags/1_2_90
From:       bphinz () users ! sourceforge ! net
Date:       2013-05-08 0:17:29
Message-ID: E1UZs4X-0005ZV-O0 () sfp-svn-1 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 5093
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5093&view=rev
Author:   bphinz
Date:     2013-05-08 00:17:26 +0000 (Wed, 08 May 2013)
Log Message:
-----------
revert r5092, should have been applied to 1_3 branch

Revision Links:
--------------
    http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5092&view=rev

Modified Paths:
--------------
    tags/1_2_90/cmake/Modules/CMakeMacroLibtoolFile.cmake
    tags/1_2_90/release/tigervnc.iss.in

Modified: tags/1_2_90/cmake/Modules/CMakeMacroLibtoolFile.cmake
===================================================================
--- tags/1_2_90/cmake/Modules/CMakeMacroLibtoolFile.cmake	2013-05-07 22:50:48 UTC \
                (rev 5092)
+++ tags/1_2_90/cmake/Modules/CMakeMacroLibtoolFile.cmake	2013-05-08 00:17:26 UTC \
(rev 5093) @@ -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_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/.libs")
+    cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/.libs")
   add_custom_command(TARGET ${_target} POST_BUILD COMMAND
-    "${CMAKE_COMMAND}" -E create_symlink ${_target_location} \
"${CMAKE_CURRENT_BINARY_DIR}/.libs/${_lname}${CMAKE_STATIC_LIBRARY_SUFFIX}") +    \
cmake -E create_symlink ${_target_location} \
"${CMAKE_CURRENT_BINARY_DIR}/.libs/${_lname}${CMAKE_STATIC_LIBRARY_SUFFIX}")  
 endmacro()

Modified: tags/1_2_90/release/tigervnc.iss.in
===================================================================
--- tags/1_2_90/release/tigervnc.iss.in	2013-05-07 22:50:48 UTC (rev 5092)
+++ tags/1_2_90/release/tigervnc.iss.in	2013-05-08 00:17:26 UTC (rev 5093)
@@ -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\wm_hooks\wm_hooks.dll"; 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\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


[prev in list] [next in list] [prev in thread] [next in thread]