[PATCH 4 of 6] Add Icon for Windows

Wald Commits scm-commit at wald.intevation.org
Fri Apr 25 12:16:57 CEST 2014


# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1398420960 0
# Node ID 5e77d1c4826ca49ad00fb38d33b34477fab409f9
# Parent  fa3a7ebf004990017aede28ad5c38daf6142194d
Add Icon for Windows

diff -r fa3a7ebf0049 -r 5e77d1c4826c ui/CMakeLists.txt
--- a/ui/CMakeLists.txt	Fri Apr 25 10:15:39 2014 +0000
+++ b/ui/CMakeLists.txt	Fri Apr 25 10:16:00 2014 +0000
@@ -24,6 +24,12 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/createcertlistdialog.cpp
 )
 
+# Cmake does not correctly identify gcc windres when cross compiling
+# making this line neccessary to set the correct flags for it.
+# See: http://public.kitware.com/Bug/view.php?id=11773
+SET(CMAKE_RC_COMPILE_OBJECT
+      "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -Ocoff <SOURCE> <OBJECT>")
+
 set(TRUSTBRIDGE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.cpp
@@ -32,6 +38,7 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/certificateitemdelegate.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/separatoritemdelegate.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/installwrapper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/img/icon.rc
     ${CERTIFICATELIST_SOURCES}
     ${DOWNLOADER_SOURCES}
 )
diff -r fa3a7ebf0049 -r 5e77d1c4826c ui/img/icon.ico
Binary file ui/img/icon.ico has changed


More information about the Trustbridge-commits mailing list