diff options
| author | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
| commit | 2e136acd34c45e5e6d105cabf91c67e5865c38fe (patch) | |
| tree | 8561603160cce0b41ba31250539a22d37a2951de /desktop/CMakeLists.txt | |
| parent | 562be6fe765d7742f7c38fbd82f8cc26369e238b (diff) | |
| parent | d9fee8b2adad613cf8c10d153cd5cd7b261b7863 (diff) | |
| download | colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.gz colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.bz2 colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.zip | |
Merge tag 'colobot-gold-0.1.3-alpha' into debian
Diffstat (limited to 'desktop/CMakeLists.txt')
| -rw-r--r-- | desktop/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt index 9fa0c5e..87c8a4b 100644 --- a/desktop/CMakeLists.txt +++ b/desktop/CMakeLists.txt @@ -4,7 +4,7 @@ set(COLOBOT_ICON_FILE colobot.svg) # Render SVG icon in various sizes find_program(RSVG_CONVERT rsvg-convert) -if(RSVG_CONVERT AND (PLATFORM_LINUX OR PLATFORM_MACOSX)) +if(RSVG_CONVERT AND (PLATFORM_GNU OR PLATFORM_MACOSX)) add_custom_target(png-icons ALL) foreach(PNGSIZE 512 256 128 48 32 16) add_custom_command( @@ -15,7 +15,7 @@ if(RSVG_CONVERT AND (PLATFORM_LINUX OR PLATFORM_MACOSX)) add_custom_target(png-icon-${PNGSIZE} ALL DEPENDS ${PNGSIZE}/colobot.png) add_dependencies(png-icons png-icon-${PNGSIZE}) - if(PLATFORM_LINUX) + if(PLATFORM_GNU) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGSIZE}/colobot.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/${PNGSIZE}x${PNGSIZE}/apps/ @@ -37,7 +37,7 @@ if(RSVG_CONVERT AND (PLATFORM_LINUX OR PLATFORM_MACOSX)) endif() -if(PLATFORM_LINUX) +if(PLATFORM_GNU) # Install Desktop Entry file set(COLOBOT_DESKTOP_FILE colobot.desktop) add_custom_command( @@ -112,7 +112,7 @@ if(PLATFORM_LINUX) endforeach() endif() endif() -endif(PLATFORM_LINUX) +endif(PLATFORM_GNU) if(PLATFORM_MACOSX) configure_file(Info.plist.cmake ${CMAKE_CURRENT_BINARY_DIR}/Info.plist) |