diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2012-02-03 17:40:55 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2012-02-03 17:40:55 +0000 |
| commit | 0d0b51e56b921231dc7d0aadee78b79e8b2cb652 (patch) | |
| tree | 6baebb25229fb6c9c1d4222fb15a9087c5eb2f50 /ui/qt | |
| parent | 9888a0a8a5c67f875ac53abaaeab2c47d172f237 (diff) | |
Don't forget about the .qrc files.
There is nothing to install for the qt gui right now.
svn path=/trunk/; revision=40826
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/CMakeLists.txt | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index 9b9be4479f..cb475fc5e2 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -90,11 +90,19 @@ set(QTSHARK_UI main_window.ui ) +set(QTSHARK_QRC + display_filter.qrc + toolbar.qrc + welcome.qrc +) + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +QT4_ADD_RESOURCES(QTSHARK_QRC_SRC ${QTSHARK_QRC}) + QT4_WRAP_UI(QTSHARK_UI_SRC ${QTSHARK_UI}) # For now, do the moc stuff manually @@ -123,25 +131,20 @@ add_library(qtui STATIC ${QTSHARK_SRC} ${QTSHARK_UI_SRC} ${QTSHARK_MOC_SRC} + ${QTSHARK_QRC_SRC} ) set_target_properties(qtui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") -install( - DIRECTORY - . - DIRECTORY_PERMISSIONS - OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ - DESTINATION - ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME} - FILES_MATCHING - # FIXME: Which (if any) of these files need to be installed - and - # where? - PATTERN "*.qrc" - PATTERN "*.svg" - PATTERN "*.png" -) +#install( +# DIRECTORY +# . +# DIRECTORY_PERMISSIONS +# OWNER_EXECUTE OWNER_WRITE OWNER_READ +# GROUP_EXECUTE GROUP_READ +# WORLD_EXECUTE WORLD_READ +# DESTINATION +# ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME} +#) #install(TARGETS ui # LIBRARY DESTINATION lib |