← Back to branch summary

~daker/webbrowser-app/fix.1317428

« back to all changes in this revision

Viewing changes to src/Ubuntu/Components/Extras/Browser/CMakeLists.txt

  • Committer: CI bot
  • Author(s): Olivier Tilloy
  • Date: 2014-06-30 08:11:35 UTC
  • mfrom: (574.2.13 selection)
  • Revision ID: ps-jenkins@lists.canonical.com-20140630081135-edips5hb81eprmm5
Re-enable contextual selection that had been disabled when switching to oxide.

Packaging change: renamed the qtdeclarative5-ubuntu-ui-extras-browser-plugin-assets package to qtdeclarative5-ubuntu-web-plugin-assets. Fixes: 1324292

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/Components/Extras/Browser/CMakeLists.txt
13
13
file(GLOB QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml qmldir *.js)
14
14
install(TARGETS ${PLUGIN} DESTINATION ${WEBBROWSER_IMPORTS_DIR})
15
15
install(FILES ${QML_FILES} DESTINATION ${WEBBROWSER_IMPORTS_DIR})
16
 
install(DIRECTORY assets
17
 
        DESTINATION ${CMAKE_INSTALL_DATADIR}/qtdeclarative5-ubuntu-ui-extras-browser-plugin
18
 
        FILES_MATCHING PATTERN *.png)
19
16
 
20
17
if(NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
21
18
  # copy qml files and assets over to build dir to be able to import them uninstalled
22
 
  file(GLOB ASSETS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} assets/*)
23
 
  set(copied ${QML_FILES} ${ASSETS})
24
 
  foreach(_file ${copied})
 
19
  foreach(_file ${QML_FILES})
25
20
    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}
26
21
                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_file}
27
22
                       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file})
28
23
  endforeach(_file)
29
 
  add_custom_target(copy_files_to_build_dir_legacy DEPENDS ${copied})
 
24
  add_custom_target(copy_files_to_build_dir_legacy DEPENDS ${QML_FILES})
30
25
  add_dependencies(${PLUGIN} copy_files_to_build_dir_legacy)
31
26
endif()