diff options
| author |  Patrick Valsecchi <patrick@thus.ch> | 2015-02-24 09:11:03 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-24 11:41:39 +0100 |
| commit | d15641a6facce67b48c5ae5e7bc56d2ed7492e67 (patch) | |
| tree | 003f01a785e6eeff7e96395c38ae4ffb5d4cb46c /CMakeLists.txt | |
| parent | 1c55f476621427cdcda36fd8b608fed2bfcc0b91 (diff) | |
| download | subsurface-d15641a6facce67b48c5ae5e7bc56d2ed7492e67.tar.gz | |
Cmake build now contains icons
Fixed the icon problem Dirk found.
We really should choose between qmake and cmake. I wouldn't care about
cmake if qmake was building the UTs...
From 8eeea28a523fd6ef588d81b82ab904d4512b3d7a Mon Sep 17 00:00:00 2001
From: Patrick Valsecchi <patrick@thus.ch>
Date: Tue, 24 Feb 2015 09:06:37 +0100
Subject: [PATCH 3/3] Cmake build now contains icons
Signed-off-by: Patrick Valsecchi <patrick@thus.ch>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c8b7e6e3..85b24efc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,7 +224,8 @@ SET(SUBSURFACE_APP ) FILE(GLOB SUBSURFACE_UI qt-ui/*.ui) -QT5_WRAP_UI( SUBSURFACE_UI_HDRS ${SUBSURFACE_UI} ) +QT5_WRAP_UI(SUBSURFACE_UI_HDRS ${SUBSURFACE_UI}) +QT5_ADD_RESOURCES(SUBSURFACE_RESOURCES subsurface.qrc) ADD_LIBRARY(subsurface_corelib STATIC ${SUBSURFACE_CORE_LIB_SRCS} ) TARGET_LINK_LIBRARIES(subsurface_corelib ${QT_LIBRARIES}) @@ -233,10 +234,11 @@ TARGET_LINK_LIBRARIES(subsurface_profile ${QT_LIBRARIES}) ADD_LIBRARY(subsurface_statistics STATIC ${SUBSURFACE_STATISTICS_LIB_SRCS}) TARGET_LINK_LIBRARIES(subsurface_statistics ${QT_LIBRARIES}) ADD_LIBRARY(subsurface_generated_ui STATIC ${SUBSURFACE_UI_HDRS}) +TARGET_LINK_LIBRARIES(subsurface_generated_ui ${QT_LIBRARIES}) ADD_LIBRARY(subsurface_interface STATIC ${SUBSURFACE_INTERFACE}) TARGET_LINK_LIBRARIES(subsurface_interface ${QT_LIBRARIES} ${MARBLE_LIBRARIES}) -ADD_EXECUTABLE(subsurface ${SUBSURFACE_APP} ${SUBSURFACE_QRC_HRDS} ) +ADD_EXECUTABLE(subsurface ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES}) target_link_libraries( subsurface subsurface_generated_ui subsurface_interface |