← Back to branch summary

~unity-team/unity8/side-stage-redesign-tutorial

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: CI Train Bot
  • Author(s): Michał Sawicz
  • Date: 2016-03-10 22:43:21 UTC
  • mfrom: (2208.1.3 fix-cross)
  • Revision ID: ci-train-bot@canonical.com-20160310224321-30futk3fkk4s5e64
Use dpkg-architecture, not arch, to disable touch emulation

Otherwise cross-building breaks
Approved by: Albert Astals Cid

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
131
131
    set(STDOUT_LOGGER "-o" "-,txt")
132
132
endif()
133
133
 
134
 
execute_process(COMMAND arch OUTPUT_VARIABLE ARCH)
 
134
execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH OUTPUT_VARIABLE ARCH)
135
135
if (NOT ARCH MATCHES "arm*")
136
136
    set(ENABLE_TOUCH_EMULATION true)
137
137
    add_definitions(-DUNITY8_ENABLE_TOUCH_EMULATION)