iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix QMLs in QtCreator

Browse Source
This commit is contained in:
craig.p.drummond
2014-04-10 21:38:25 +00:00
committed by craig.p.drummond
parent 38395d2ea4
commit 2fa4296070
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -755,19 +755,6 @@ endif (ENABLE_KDE)
macro_display_feature_log()
if (ENABLE_UBUNTU)
#Make QML visible to QtCreator
add_custom_target(components_QmlFiles ALL SOURCES ${UBUNTU_QMLS})
# make install not workign with emulator builds?
#
#
# install(TARGETS cantata DESTINATION ${CMAKE_INSTALL_PREFIX})
# # TODO: Rename ubuntu/manifest.json to ubuntu/manifest.json and get cmake to update version number
# install(FILES icons/cantata.svg ubuntu/cantata-ubuntu.desktop ubuntu/cantata-ubuntu.json ubuntu/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
#install(DIRECTORY ${CMAKE_BINARY_DIR}/qml DESTINATION share/cantata)
#install(TARGETS cantata RUNTIME DESTINATION bin)
set(UBUNTU_CLICK_FOLDER ${CMAKE_BINARY_DIR}/click/)
file(MAKE_DIRECTORY ${UBUNTU_CLICK_FOLDER})
file(MAKE_DIRECTORY ${UBUNTU_CLICK_FOLDER}/ubuntu/qml/cantata)
@@ -787,6 +774,9 @@ if (ENABLE_UBUNTU)
add_custom_command(TARGET cantata COMMAND ln ARGS -f ${qmlFile} ${UBUNTU_CLICK_FOLDER}/ubuntu/qml/cantata)
endforeach (qmlFile ${UBUNTU_QMLS})
#Make QML visible to QtCreator
add_custom_target(components_QmlFiles ALL SOURCES ${UBUNTU_QMLS})
set(UBUNTU_TOOLBAR_ICONS
${CMAKE_SOURCE_DIR}/ubuntu/icons/toolbar/settings.svg
${CMAKE_SOURCE_DIR}/ubuntu/icons/toolbar/add.svg