~osomon/oxide/restore-error-page-unit-test

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Chris Coulson
  • Date: 2015-02-24 17:20:08 UTC
  • Revision ID: chris.coulson@canonical.com-20150224172008-5gaid70of9ch4e0d
Add USE_SYSTEM_PROTOBUF build option. Using the system protobuf is necessary in component builds where Oxide is loaded by an application that has already loaded the system protobuf (ie, any Mir client) and the system protobuf is at a different version to the in-tree version

Show diffs side-by-side

added added

removed removed

Lines of Context:
167
167
else()
168
168
  list(APPEND _GYP_COMMAND -Denable_mediahub=1)
169
169
endif()
 
170
if(USE_SYSTEM_PROTOBUF)
 
171
  list(APPEND _GYP_COMMAND -Duse_system_protobuf=1)
 
172
endif()
170
173
 
171
174
if(CMAKE_CROSSCOMPILING)
172
175
  if(NOT CHROMIUM_C_HOST_COMPILER OR NOT CHROMIUM_CXX_HOST_COMPILER OR NOT CHROMIUM_HOST_AR)