From 506a937988e83b5f678b85af3ce135e4f5c37259 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Tue, 30 Nov 2010 14:01:24 +0100 Subject: [PATCH] added icon and disabled console window for release builds --- data/CMakeLists.txt | 16 ++++++++++++++++ data/zzz.ico | Bin 0 -> 30166 bytes src/CMakeLists.txt | 14 +++++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 data/zzz.ico diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 5ffd513..0c4f991 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1 +1,17 @@ set(SNORE_RCS ${SNORE_RCS} ../data/snore.qrc PARENT_SCOPE) + +if(WIN32) + if(MINGW) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zzz.rc "IDI_ICON1 ICON DISCARDABLE \"zzz.ico\"\n") + find_program(WINDRES_EXECUTABLE NAMES windres) + if(WINDRES_EXECUTABLE) + exec_program(windres + ARGS "-i ${CMAKE_CURRENT_BINARY_DIR}/zzz.rc" + "-o ${CMAKE_CURRENT_BINARY_DIR}/zzz.o" + "--include-dir=${CMAKE_CURRENT_SOURCE_DIR}") + set(SNORENOTIFY_DEPS ${SNORENOTIFY_DEPS} ${CMAKE_CURRENT_BINARY_DIR}/zzz.o PARENT_SCOPE) + endif(WINDRES_EXECUTABLE) + else(MINGW) + set(SNORENOTIFY_DEPS ${SNORENOTIFY_DEPS} ../data/zzz.rc PARENT_SCOPE) + endif(MINGW) +endif(WIN32) \ No newline at end of file diff --git a/data/zzz.ico b/data/zzz.ico new file mode 100644 index 0000000000000000000000000000000000000000..0ee89d6d9c68d50e8b4fb293466ece677ba86884 GIT binary patch literal 30166 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 literal 0 HcmV?d00001 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8a59367..0bc85fa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,10 +5,18 @@ include_directories( add_subdirectory(core) -QT4_ADD_RESOURCES(snorenotify_DEPS ${SNORE_RCS}) -automoc4_add_executable( snorenotify main.cpp trayicon.cpp ${snorenotify_DEPS}) +QT4_ADD_RESOURCES(SNORENOTIFY_RCS ${SNORE_RCS}) +set(SNORENOTIFY_DEPS ${SNORENOTIFY_DEPS} ${SNORENOTIFY_RCS}) -target_link_libraries( snorenotify snorecore ${QT_QTGUI_LIBRARY} ) +if(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug) + set(WIN32_SPECIFIC) +else(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug) + set(WIN32_SPECIFIC WIN32) +endif(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug) + +automoc4_add_executable( snorenotify ${WIN32_SPECIFIC} main.cpp trayicon.cpp ${SNORENOTIFY_DEPS}) + +target_link_libraries( snorenotify snorecore ${QT_QTGUI_LIBRARY} ) add_dependencies(snorenotify snorecore) install(TARGETS snorenotify RUNTIME DESTINATION bin