I should add that, with this patch, the build system can still be used to regenerate the in-tree copies of the icons, if for any reason they need updating. Simply
cd media make clean make icons On 1/7/13 4:24 PM, dcomman...@users.sourceforge.net wrote: > Revision: 5024 > http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5024&view=rev > Author: dcommander > Date: 2013-01-07 22:24:01 +0000 (Mon, 07 Jan 2013) > Log Message: > ----------- > Check the generated icons into the build tree. This solves a couple of > issues: (1) it eliminates the build dependency on ImageMagick, which was not > documented and which creates a hard-to-diagnose build failure on platforms on > which it isn't available, and (2) the build was completely broken on Windows, > because Windows has a convert.exe program that is part of the operating > system, and the TigerVNC build system was finding this and attempting to use > it to generate the icons. > > Modified Paths: > -------------- > trunk/media/CMakeLists.txt > > Added Paths: > ----------- > trunk/media/icons/tigervnc_16.png > trunk/media/icons/tigervnc_22.png > trunk/media/icons/tigervnc_24.png > trunk/media/icons/tigervnc_32.png > trunk/media/icons/tigervnc_48.png > > Modified: trunk/media/CMakeLists.txt > =================================================================== > --- trunk/media/CMakeLists.txt 2013-01-07 09:59:00 UTC (rev 5023) > +++ trunk/media/CMakeLists.txt 2013-01-07 22:24:01 UTC (rev 5024) > @@ -1,18 +1,18 @@ > set(ICON_FILES > - icons/tigervnc_16.png > - icons/tigervnc_22.png > - icons/tigervnc_24.png > - icons/tigervnc_32.png > - icons/tigervnc_48.png) > + ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_16.png > + ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_22.png > + ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_24.png > + ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_32.png > + ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_48.png) > > find_program(CONVERT_EXECUTABLE convert) > > if(CONVERT_EXECUTABLE) > - add_custom_target(icons-target ALL DEPENDS ${ICON_FILES}) > + add_custom_target(icons DEPENDS ${ICON_FILES}) > > if(UNIX AND NOT APPLE) > foreach(SIZE 16 22 24 32 48) > - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/icons/tigervnc_${SIZE}.png > + install(FILES icons/tigervnc_${SIZE}.png > DESTINATION ${DATA_DIR}/icons/hicolor/${SIZE}x${SIZE}/apps > RENAME tigervnc.png) > endforeach() > @@ -21,34 +21,37 @@ > endif() > endif() > > -add_custom_command(OUTPUT icons COMMAND mkdir icons) > - > -add_custom_command(OUTPUT icons/tigervnc_16.png > +add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_16.png > COMMAND ${CONVERT_EXECUTABLE} -background transparent > - ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_16.svg icons/tigervnc_16.png > + ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_16.svg > + ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_16.png > DEPENDS icons ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_16.svg > COMMENT "Generating icons/tigervnc_16.png") > > -add_custom_command(OUTPUT icons/tigervnc_22.png > +add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_22.png > COMMAND ${CONVERT_EXECUTABLE} -size 22x22 xc:none -gravity center > -background transparent > - ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg -composite > icons/tigervnc_22.png > + ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg -composite > + ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_22.png > DEPENDS icons ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg > COMMENT "Generating icons/tigervnc_22.png") > > -add_custom_command(OUTPUT icons/tigervnc_24.png > +add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_24.png > COMMAND ${CONVERT_EXECUTABLE} -size 24x24 xc:none -gravity center > -background transparent > - ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg -composite > icons/tigervnc_24.png > + ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg -composite > + ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_24.png > DEPENDS icons ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg > COMMENT "Generating icons/tigervnc_24.png") > > -add_custom_command(OUTPUT icons/tigervnc_32.png > +add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_32.png > COMMAND ${CONVERT_EXECUTABLE} -size 32x32 xc:none -gravity center > -background transparent > - ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_28.svg -composite > icons/tigervnc_32.png > + ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_28.svg -composite > + ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_32.png > DEPENDS icons ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_28.svg > COMMENT "Generating icons/tigervnc_32.png") > > -add_custom_command(OUTPUT icons/tigervnc_48.png > +add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_48.png > COMMAND ${CONVERT_EXECUTABLE} -size 48x48 xc:none -gravity center > -background transparent > - ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_42.svg -composite > icons/tigervnc_48.png > + ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_42.svg -composite > + ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_48.png > DEPENDS icons ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_42.svg > COMMENT "Generating icons/tigervnc_48.png") > > Added: trunk/media/icons/tigervnc_16.png > =================================================================== > (Binary files differ) > > > Property changes on: trunk/media/icons/tigervnc_16.png > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: trunk/media/icons/tigervnc_22.png > =================================================================== > (Binary files differ) > > > Property changes on: trunk/media/icons/tigervnc_22.png > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: trunk/media/icons/tigervnc_24.png > =================================================================== > (Binary files differ) > > > Property changes on: trunk/media/icons/tigervnc_24.png > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: trunk/media/icons/tigervnc_32.png > =================================================================== > (Binary files differ) > > > Property changes on: trunk/media/icons/tigervnc_32.png > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: trunk/media/icons/tigervnc_48.png > =================================================================== > (Binary files differ) > > > Property changes on: trunk/media/icons/tigervnc_48.png > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > This was sent by the SourceForge.net collaborative development platform, the > world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, > MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current > with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft > MVPs and experts. SALE $99.99 this month only -- learn more at: > http://p.sf.net/sfu/learnmore_122412 > _______________________________________________ > Tigervnc-commits mailing list > tigervnc-comm...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/tigervnc-commits > ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122412 _______________________________________________ Tigervnc-devel mailing list Tigervnc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tigervnc-devel