← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to CMakeLists.txt

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
104
104
  "graphics backend to build (options are 'gbm' or 'android')"
105
105
)
106
106
 
107
 
set (MIR_INPUT_USE_ANDROID_TYPES
108
 
  false
109
 
  CACHE
110
 
  BOOL
111
 
  "Use android types in input stack instead of std library"
112
 
)
113
 
 
114
107
find_package(EGL REQUIRED)
115
108
find_package(GLESv2 REQUIRED)
 
109
find_package(GLM REQUIRED)
116
110
find_package(Protobuf REQUIRED )
117
111
find_package(GLog REQUIRED)
118
112
find_package(GFlags REQUIRED)
119
113
find_package(XKBCOMMON REQUIRED)
120
114
 
121
 
include_directories (${GLESv2_INCLUDE_DIRS})                                    
 
115
include_directories (${GLESv2_INCLUDE_DIRS})
122
116
include_directories (${EGL_INCLUDE_DIRS})
 
117
include_directories (${GLM_INCLUDE_DIRS})
123
118
 
124
 
if (NOT MIR_INPUT_USE_ANDROID_TYPES)
125
 
add_definitions(
126
 
  -DANDROID_USE_STD
127
 
)
128
 
endif()
 
119
add_definitions(-DANDROID_USE_STD)
129
120
 
130
121
if (MIR_PLATFORM STREQUAL "android")
131
122
  include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/3rd_party/android-deps)