]> sigrok.org Git - pulseview.git/commitdiff
mingw: Add the sigrok icon for pulseview.exe.
authorUwe Hermann <redacted>
Fri, 3 Jan 2014 15:28:02 +0000 (16:28 +0100)
committerUwe Hermann <redacted>
Fri, 3 Jan 2014 15:54:26 +0000 (16:54 +0100)
Add an .rc file (needed for the Windows executable icon), and hook up
building/adding the respective object in CMakeLists.txt.

This closes bug #110.

CMakeLists.txt
pulseviewico.rc [new file with mode: 0644]

index 5ec003fc44e94f283715c883812f2357d67390d7..8302b4828cc3fff1cfaca42926ba0481c0c50996 100644 (file)
@@ -213,6 +213,13 @@ if(ENABLE_DECODE)
        )
 endif()
 
+if(WIN32)
+       # Use the sigrok icon for the pulseview.exe executable.
+       set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR} <SOURCE> <OBJECT>")
+       enable_language(RC)
+       list(APPEND pulseview_SOURCES pulseviewico.rc)
+endif()
+
 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
 qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
diff --git a/pulseviewico.rc b/pulseviewico.rc
new file mode 100644 (file)
index 0000000..4ba6fd0
--- /dev/null
@@ -0,0 +1 @@
+IDI_ICON1      ICON    DISCARDABLE     "icons/sigrok-logo-notext.ico"