From e8844deeef191ccc8bcfe6084d5abb9cb693d4e6 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Sun, 29 Jan 2012 18:30:02 +0100 Subject: [PATCH] added unix desktop icons and menu items to install target --- cockatrice/CMakeLists.txt | 7 ++++++- cockatrice/cockatrice.qrc | 2 +- cockatrice/resources/cockatrice.png | Bin 0 -> 2869 bytes .../resources/{appicon.svg => cockatrice.svg} | 0 oracle/CMakeLists.txt | 3 +++ oracle/oracle.desktop | 8 ++++++++ 6 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 cockatrice/resources/cockatrice.png rename cockatrice/resources/{appicon.svg => cockatrice.svg} (100%) create mode 100644 oracle/oracle.desktop diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 01643e4a..b70d29b1 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -164,7 +164,6 @@ if(APPLE) set_source_files_properties(${OSX_ICON_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) set( cockatrice_SOURCES ${cockatrice_SOURCES} ${OSX_ICON_FILES} ) ENDIF(APPLE) - SET(QT_USE_QTNETWORK TRUE) SET(QT_USE_QTSCRIPT TRUE) SET(QT_USE_QTMULTIMEDIA TRUE) @@ -194,3 +193,9 @@ ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY} ${PROTOBUF_LIBRARIES}) INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin) +if (NOT WIN32 AND NOT APPLE) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION share/icons/hicolor/48x48/apps) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION share/icons/hicolor/scalable/apps) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION share/applications) +ENDIF(NOT WIN32 AND NOT APPLE) + diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 6866e778..dd7416de 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -26,7 +26,7 @@ resources/icon_clearsearch.svg resources/icon_update.png resources/hr.jpg - resources/appicon.svg + resources/cockatrice.svg resources/add_to_sideboard.svg resources/decrement.svg resources/increment.svg diff --git a/cockatrice/resources/cockatrice.png b/cockatrice/resources/cockatrice.png new file mode 100644 index 0000000000000000000000000000000000000000..ed79b88a0eae2dad6ea6c748211597e358927b92 GIT binary patch literal 2869 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