← Back to branch summary

~ubuntu-branches/ubuntu/quantal/cmake/quantal

« back to all changes in this revision

Viewing changes to Modules/FindX11.cmake

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-04-30 12:14:32 UTC
  • mfrom: (3.1.30 sid)
  • Revision ID: package-import@ubuntu.com-20120430121432-rqh2fjl3zcblehh5
Tags: 2.8.8-2ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add xfail_compiler_flag.diff: Mark compiler flag tests as expected
    failures.
  - Add ubuntu_qt_import_dir_variable.diff: define QT_IMPORTS_DIR even
    when that dir does not exist.
* Remove increase_ctest_test_timeout.diff, merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Modules/FindX11.cmake
20
20
#                X11_XShm_INCLUDE_PATH,         (in X11_Xext_LIB),  X11_XShm_FOUND
21
21
#                X11_Xshape_INCLUDE_PATH,       (in X11_Xext_LIB),  X11_Xshape_FOUND
22
22
#                X11_xf86misc_INCLUDE_PATH,     X11_Xxf86misc_LIB,  X11_xf86misc_FOUND
23
 
#                X11_xf86vmode_INCLUDE_PATH,                        X11_xf86vmode_FOUND
 
23
#                X11_xf86vmode_INCLUDE_PATH,    X11_Xxf86vm_LIB     X11_xf86vmode_FOUND
24
24
#                X11_Xfixes_INCLUDE_PATH,       X11_Xfixes_LIB,     X11_Xfixes_FOUND
25
25
#                X11_Xft_INCLUDE_PATH,          X11_Xft_LIB,        X11_Xft_FOUND
26
26
#                X11_Xi_INCLUDE_PATH,           X11_Xi_LIB,         X11_Xi_FOUND
29
29
#                X11_Xkb_INCLUDE_PATH,                              X11_Xkb_FOUND
30
30
#                X11_Xkblib_INCLUDE_PATH,                           X11_Xkb_FOUND
31
31
#                X11_Xkbfile_INCLUDE_PATH,      X11_Xkbfile_LIB,    X11_Xkbfile_FOUND
 
32
#                X11_Xmu_INCLUDE_PATH,          X11_Xmu_LIB,        X11_Xmu_FOUND
32
33
#                X11_Xpm_INCLUDE_PATH,          X11_Xpm_LIB,        X11_Xpm_FOUND
33
34
#                X11_XTest_INCLUDE_PATH,        X11_XTest_LIB,      X11_XTest_FOUND
34
35
#                X11_Xrandr_INCLUDE_PATH,       X11_Xrandr_LIB,     X11_Xrandr_FOUND
103
104
  FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h                ${X11_INC_SEARCH_PATH})
104
105
  FIND_PATH(X11_Xkblib_INCLUDE_PATH X11/XKBlib.h                     ${X11_INC_SEARCH_PATH})
105
106
  FIND_PATH(X11_Xkbfile_INCLUDE_PATH X11/extensions/XKBfile.h        ${X11_INC_SEARCH_PATH})
 
107
  FIND_PATH(X11_Xmu_INCLUDE_PATH X11/Xmu/Xmu.h                       ${X11_INC_SEARCH_PATH})
106
108
  FIND_PATH(X11_Xpm_INCLUDE_PATH X11/xpm.h                           ${X11_INC_SEARCH_PATH})
107
109
  FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h            ${X11_INC_SEARCH_PATH})
108
110
  FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h              ${X11_INC_SEARCH_PATH})
134
136
  FIND_LIBRARY(X11_Xinerama_LIB Xinerama     ${X11_LIB_SEARCH_PATH})
135
137
  FIND_LIBRARY(X11_Xinput_LIB Xi             ${X11_LIB_SEARCH_PATH})
136
138
  FIND_LIBRARY(X11_Xkbfile_LIB xkbfile       ${X11_LIB_SEARCH_PATH})
 
139
  FIND_LIBRARY(X11_Xmu_LIB Xmu               ${X11_LIB_SEARCH_PATH})
137
140
  FIND_LIBRARY(X11_Xpm_LIB Xpm               ${X11_LIB_SEARCH_PATH})
138
141
  FIND_LIBRARY(X11_Xrandr_LIB Xrandr         ${X11_LIB_SEARCH_PATH})
139
142
  FIND_LIBRARY(X11_Xrender_LIB Xrender       ${X11_LIB_SEARCH_PATH})
143
146
  FIND_LIBRARY(X11_XTest_LIB Xtst            ${X11_LIB_SEARCH_PATH})
144
147
  FIND_LIBRARY(X11_Xv_LIB Xv                 ${X11_LIB_SEARCH_PATH})
145
148
  FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc   ${X11_LIB_SEARCH_PATH})
 
149
  FIND_LIBRARY(X11_Xxf86vm_LIB Xxf86vm       ${X11_LIB_SEARCH_PATH})
146
150
 
147
151
  SET(X11_LIBRARY_DIR "")
148
152
  IF(X11_X11_LIB)
267
271
     SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86misc_INCLUDE_PATH})
268
272
  ENDIF (X11_xf86misc_INCLUDE_PATH  AND X11_Xxf86misc_LIB)
269
273
 
270
 
  IF (X11_xf86vmode_INCLUDE_PATH)
 
274
  IF (X11_xf86vmode_INCLUDE_PATH AND X11_Xxf86vm_LIB)
271
275
     SET(X11_xf86vmode_FOUND TRUE)
272
276
     SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86vmode_INCLUDE_PATH})
273
 
  ENDIF (X11_xf86vmode_INCLUDE_PATH)
 
277
  ENDIF (X11_xf86vmode_INCLUDE_PATH AND X11_Xxf86vm_LIB)
274
278
 
275
279
  IF (X11_Xcursor_INCLUDE_PATH AND X11_Xcursor_LIB)
276
280
     SET(X11_Xcursor_FOUND TRUE)
297
301
     SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xkbfile_INCLUDE_PATH} )
298
302
  ENDIF (X11_Xkbfile_INCLUDE_PATH AND X11_Xkbfile_LIB AND X11_Xlib_INCLUDE_PATH)
299
303
 
 
304
  IF (X11_Xmu_INCLUDE_PATH AND X11_Xmu_LIB)
 
305
     SET(X11_Xmu_FOUND TRUE)
 
306
     SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xmu_INCLUDE_PATH})
 
307
  ENDIF (X11_Xmu_INCLUDE_PATH AND X11_Xmu_LIB)
 
308
 
300
309
  IF (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB)
301
310
     SET(X11_Xinput_FOUND TRUE)
302
311
     SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput_INCLUDE_PATH})
435
444
    X11_XRes_INCLUDE_PATH
436
445
    X11_Xxf86misc_LIB
437
446
    X11_xf86misc_INCLUDE_PATH
 
447
    X11_Xxf86vm_LIB
438
448
    X11_xf86vmode_INCLUDE_PATH
439
449
    X11_Xi_LIB
440
450
    X11_Xi_INCLUDE_PATH
456
466
    X11_Xkblib_INCLUDE_PATH
457
467
    X11_Xkbfile_INCLUDE_PATH
458
468
    X11_Xkbfile_LIB
 
469
    X11_Xmu_INCLUDE_PATH
 
470
    X11_Xmu_LIB
459
471
    X11_Xscreensaver_INCLUDE_PATH
460
472
    X11_Xscreensaver_LIB
461
473
    X11_Xpm_INCLUDE_PATH