← Back to branch summary

~abreu-alexandre/oxide/fix-sendMessageNoReply-crash

« back to all changes in this revision

Viewing changes to qt/build/scripts/package.cmake

  • Committer: Chris Coulson
  • Date: 2015-02-24 00:42:20 UTC
  • Revision ID: chris.coulson@canonical.com-20150224004220-2g1dm7sr6x1iqbvx
Fix the output of make package to work properly in component builds

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/build/scripts/package.cmake
18
18
 
19
19
cmake_policy(VERSION 2.6.0)
20
20
 
21
 
foreach(v STAGE_DIR OUTPUT_DIR FILES PROGRAMS DIRECTORIES RUN_QMLAPP_IN RENDERER_PATH)
 
21
foreach(v STAGE_DIR OUTPUT_DIR FILES PROGRAMS DIRECTORIES RUN_QMLAPP_IN RENDERER_PATH SUBPROCESS_DIR)
22
22
  if(NOT DEFINED ${v})
23
23
    message(FATAL_ERROR "${v} must be defined")
24
24
  endif()
54
54
  endforeach()
55
55
endforeach()
56
56
 
57
 
set(CHROMIUM_LIB_DIR "$(dirname $(readlink -f $0))")
 
57
set(CHROMIUM_LIB_DIR "$(dirname $(readlink -f $0))/${SUBPROCESS_DIR}")
58
58
set(LIB_OUTPUT_DIR "$(dirname $(readlink -f $0))")
59
 
set(CHROMIUM_PRODUCT_DIR "$(dirname $(readlink -f $0))")
 
59
set(CHROMIUM_PRODUCT_DIR "$(dirname $(readlink -f $0))/${SUBPROCESS_DIR}")
60
60
set(OXIDE_RENDERER_NAME ${RENDERER_PATH})
61
 
set(QMLPLUGIN_OUTPUT_DIR "$(dirname $(readlink -f $0))")
 
61
set(QMLPLUGIN_OUTPUT_DIR "$(dirname $(readlink -f $0))/qml")
62
62
 
63
63
configure_file(${RUN_QMLAPP_IN} ${STAGE_DIR}/.tmp/run_qmlapp.sh IMMEDIATE @ONLY)
64
64
file(INSTALL ${STAGE_DIR}/.tmp/run_qmlapp.sh DESTINATION ${STAGE_DIR}