← Back to branch summary

~ubuntu-branches/ubuntu/wily/marble/wily

« back to all changes in this revision

Viewing changes to src/apps/marble-touch/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell, José Manuel Santamaría Lema, Jonathan Riddell, Philip Muškovac
  • Date: 2015-08-13 11:44:25 UTC
  • mfrom: (1.5.12)
  • Revision ID: package-import@ubuntu.com-20150813114425-kdwa08ijv9p1f1rt
Tags: 4:15.08.0-0ubuntu1
[ José Manuel Santamaría Lema ]
* Update symbols: mark as optional symbols gone after building with
  GCC 5

[ Jonathan Riddell ]
* New upstream release
* Port to frameworks 5
* new upstream beta release

[ Philip Muškovac ]
* Add upstream_fix-vtable-linking.diff to fix vtable linking

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/apps/marble-touch/CMakeLists.txt
5
5
 ${CMAKE_CURRENT_BINARY_DIR}
6
6
 ${QT_INCLUDE_DIR}
7
7
)
8
 
IF (QT4_FOUND)
 
8
IF (QT4BUILD)
9
9
  INCLUDE(${QT_USE_FILE})
10
10
else()
11
11
INCLUDE_DIRECTORIES(
22
22
marble_add_project_resources(${QML_FILES})
23
23
 
24
24
qt_add_resources(my_SRCS meego.qrc harmattan/harmattan.qrc)
25
 
marble_qt4_automoc( ${my_SRCS} )
26
25
add_executable( marble-touch ${my_SRCS} )
27
 
if (QT4_FOUND)
28
 
  target_link_libraries( marble-touch ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} marblewidget )
 
26
if (QT4BUILD)
 
27
  target_link_libraries( marble-touch ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${MARBLEWIDGET} )
29
28
else() 
30
29
  target_link_libraries (
31
30
    marble-touch
34
33
    ${Qt5Network_LIBRARIES}
35
34
    ${Qt5WebKitWidgets_LIBRARIES}
36
35
    ${Qt5WebKit_LIBRARIES}
37
 
    marblewidget)
 
36
    ${MARBLEWIDGET})
38
37
endif()
39
38
install( TARGETS marble-touch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
40
39
if(APPS_INSTALL_DIR)