← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to intern/ghost/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/ghost/CMakeLists.txt
108
108
        )
109
109
endif()
110
110
 
111
 
if(WITH_XDG_USER_DIRS)
112
 
        add_definitions(-DWITH_XDG_USER_DIRS)
113
 
endif()
114
 
 
115
111
if(WITH_HEADLESS OR WITH_GHOST_SDL)
116
112
        if(WITH_HEADLESS)
117
113
                list(APPEND SRC
147
143
                                intern/GHOST_SystemPathsCarbon.h
148
144
                        )
149
145
                endif()
 
146
 
150
147
        elseif(UNIX)
151
148
                list(APPEND SRC
152
149
                        intern/GHOST_SystemPathsX11.cpp
156
153
                if(NOT WITH_INSTALL_PORTABLE)
157
154
                        add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
158
155
                endif()
 
156
 
159
157
        elseif(WIN32)
160
 
 
161
158
                list(APPEND SRC
162
159
                        intern/GHOST_SystemPathsWin32.cpp
163
160
 
164
161
                        intern/GHOST_SystemPathsWin32.h
165
162
                )
166
 
        endif()
167
 
 
168
 
        list(APPEND INC_SYS
169
 
                ${SDL_INCLUDE_DIR}
170
 
        )
 
163
 
 
164
                list(APPEND INC
 
165
                        ../utfconv
 
166
                )
 
167
        endif()
 
168
 
 
169
        if(NOT WITH_HEADLESS)
 
170
                list(APPEND INC_SYS
 
171
                        ${SDL_INCLUDE_DIR}
 
172
                )
 
173
        endif()
171
174
 
172
175
elseif(APPLE)
173
176
        if(WITH_COCOA)
186
189
                if(WITH_INPUT_NDOF)
187
190
                        list(APPEND SRC
188
191
                                intern/GHOST_NDOFManagerCocoa.mm
189
 
 
190
192
                                intern/GHOST_NDOFManagerCocoa.h
191
193
                        )
192
194
                endif()
269
271
 
270
272
        if(WITH_X11_XINPUT)
271
273
                add_definitions(-DWITH_X11_XINPUT)
 
274
                list(APPEND INC_SYS
 
275
                        ${X11_Xinput_INCLUDE_PATH}
 
276
                )
272
277
        endif()
273
278
 
274
279
elseif(WIN32)