~robertcarr/mir/send-clients-input

« back to all changes in this revision

Viewing changes to 3rd_party/CMakeLists.txt

  • Committer: Daniel van Vugt
  • Date: 2013-03-07 08:04:05 UTC
  • mfrom: (467.1.6 trunk)
  • mto: (467.1.21 trunk)
  • mto: This revision was merged to the branch mainline in revision 486.
  • Revision ID: daniel.van.vugt@canonical.com-20130307080405-vgn5g2ts7j08xekk
Merge latest lp:mir

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright © 2012 Canonical Ltd.
2
 
#
3
 
# This program is free software: you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License version 3 as
5
 
# published by the Free Software Foundation.
6
 
#
7
 
# This program is distributed in the hope that it will be useful,
8
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
10
 
# GNU General Public License for more details.
11
 
#
12
 
# You should have received a copy of the GNU General Public License
13
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 
#
15
 
# Authored by: Alan Griffiths <alan@octopull.co.uk>
16
 
 
17
1
list(
18
2
  APPEND MIR_3RD_PARTY_INCLUDE_DIRECTORIES
19
3
  ${CMAKE_CURRENT_SOURCE_DIR}/libancillary
20
 
  ${CMAKE_CURRENT_SOURCE_DIR}/glm)
 
4
  ${CMAKE_CURRENT_SOURCE_DIR}/glm
 
5
  ${CMAKE_CURRENT_SOURCE_DIR}/android-deps
 
6
  )
21
7
 
22
8
list(
23
9
  APPEND MIR_3RD_PARTY_SOURCES 
36
22
  PARENT_SCOPE)
37
23
 
38
24
if (NOT MIR_DISABLE_INPUT)
39
 
add_subdirectory(android-input)
 
25
  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/android-deps)
 
26
  add_subdirectory(android-input)
40
27
endif()
41
28
 
42
29
set(MIR_ANDROID_INCLUDE_DIRECTORIES ${MIR_ANDROID_INCLUDE_DIRECTORIES} PARENT_SCOPE)