Commit Graph

49 Commits

Author SHA1 Message Date
Marius Schamschula
488d9682cc FindX11: Search in /opt/X11 for OS X 10.8 (#14232)
As of Mac OS X 10.8, X11 is no longer installed under /usr/X11, but
under /opt/X11.
2013-06-20 08:47:12 -04:00
Rolf Eike Beer
8ebf74b02f Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include()
This solves a lots of warnings, e.g. in the FindModulesExecuteAll test. If the
installed version on the system is rather old this may even lead to bugs, e.g.
https://bugs.gentoo.org/show_bug.cgi?id=436540
2012-11-04 05:55:37 +01:00
Rolf Eike Beer
dd784dde72 FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty list 2012-08-15 19:28:50 +02:00
Rolf Eike Beer
97c338bac9 FindX11: remove duplicates from X11 include path list (#13316)
Most if not all X11 includes are typically in the same directory, so this
usually returns a huge list with only very few different entries.
2012-08-14 21:13:44 +02:00
Kitware Robot
9db3116226 Remove CMake-language block-end command arguments
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block.  This is no longer the preferred style.

Run the following shell code:

for c in else endif endforeach endfunction endmacro endwhile; do
    echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
2012-08-13 14:19:16 -04:00
Kitware Robot
77543bde41 Convert CMake-language commands to lower case
Ancient CMake versions required upper-case commands.  Later command
names became case-insensitive.  Now the preferred style is lower-case.

Run the following shell code:

cmake --help-command-list |
grep -v "cmake version" |
while read c; do
    echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
2012-08-13 14:19:16 -04:00
Alex Neundorf
b2951624dc fix #6976: FindX11 also searches for X11_Xxf86vm_LIB
This contains a change, which changes the behaviour a bit:
now X11_xf86vmode_FOUND is only set to TRUE and the include directory
is added to X11_INCLUDE_DIR, if additionally to X11_xf86vmode_INCLUDE_PATH
also X11_Xxf86vm_LIB has been found.
I hope this doesn't cause regressions somewhere.

Alex
2012-02-16 09:36:27 +01:00
Rolf Eike Beer
c008141eee FindX11: also search for Xmu (#12447) 2012-02-08 20:15:20 +01:00
Dan Kegel
0e721e5129 Modules: Add XRes to FindX11.cmake 2011-11-09 06:22:32 -05:00
Alex Neundorf
6899e58fa0 Also search for libxkbfile, XSync and SM include dir
Alex
2011-08-03 22:33:18 +02:00
Alex Neundorf
fe6bb7af2a Remove trailing whitespace
Alex
2011-08-03 22:32:28 +02:00
Todd Gamblin
2cde67a781 Modules: Fix spelling 'To distributed' -> 'To distribute' 2010-08-09 08:48:31 -04:00
Clinton Stimpson
44492fff53 Add support for libXi. 2010-03-17 10:48:05 -06:00
Alexander Neundorf
04d3f576b1 Document X11_X11_LIB and X11_X11_INCLUDE_PATH
Alex
2009-11-15 13:26:59 -05:00
Brad King
c4bb9c9d42 Convert CMake find-modules to BSD License
This adds copyright/license notification blocks CMake's find-modules.
Many of the modules had no notices at all.  Some had notices referring
to the BSD license already.  This commit normalizes existing notices and
adds missing notices.
2009-09-28 11:45:50 -04:00
Alexander Neundorf
5295385c34 ENH: also search in /usr/X11R7, remove /usr/lib and /usr/local/lib, they are
part of the standard search paths (partly sync wih KDE)

Alex
2008-08-16 07:38:12 -04:00
Sebastien Barre
7dd720cebb ENH: X11_SM_LIB should be advanced as well 2008-05-03 15:27:40 -04:00
Brad King
7a888b68da ENH: Added FindPackageMessage module
- Defines FIND_PACKAGE_MESSAGE function to help display
    find result messages only once
  - Added use of it to FindPackageHandleStandardArgs
  - Added use of it to FindQt4, and FindX11
  - This cleans up repeated messages in big projects
2008-03-17 11:10:42 -04:00
Brad King
9de44ef28a BUG: FindX11 module should search for SM library instead of returning -lSM. 2008-01-20 16:02:38 -05:00
Alexander Neundorf
b67a35e081 BUG: fix spelling of the xf86misc and xf86vmode variables
Alex
2008-01-04 11:56:18 -05:00
Alexander Neundorf
79077f8373 ENH: more consistence among the X11 components
Alex
2007-06-08 10:28:52 -04:00
Alexander Neundorf
f94b8cfd3c COMP: fix warnings on some machines where some X libs apparently don't
really work by reverting X11_LIBRARIES back to the old version
-add some more X11_xxx_FOUND variables
-reformat comments at the top
-always use IF(INCLUDE_DIR and LIB) for setting FOUND to TRUE

Alex
2007-06-01 13:17:23 -04:00
Alexander Neundorf
5a6a3cd869 ENH: mostly synced with FindX11.cmake from KDE svn: now also searches for a
lot of additional X11 libs, like Xv, Xau, Xrandr and others

Alex
2007-05-30 12:09:34 -04:00
Bill Hoffman
d71f723b11 ENH: fix find x11 on the mac 2006-04-17 15:55:24 -04:00
Bill Hoffman
f7f05bee76 ENH: make sure frameworks are not searched for x header files 2006-04-14 15:08:25 -04:00
Ken Martin
74eaecfc3e ENH: cleanups 2005-12-15 14:17:43 -05:00
Bill Hoffman
b7fa820118 ENH: add documentation support for modules 2005-12-14 13:51:08 -05:00
Brad King
290ffc01b6 ENH: Removing extra 64-bit search paths. They are now constructed automatically from the paths listed. 2005-04-07 14:27:01 -04:00
Brad King
76f9050026 ENH: Adding support for 64-bit library paths. Contributed by Peter Vanroose. 2005-04-07 13:46:02 -04:00
Andy Cedilnik
ad4f98f3cf ENH: Cleanup. Use relative path to modules 2004-08-26 22:52:53 -04:00
Andy Cedilnik
d530fbe731 Attempt to fix build problem on some platforms 2003-01-29 09:06:46 -05:00
Will Schroeder
ece369eaf3 BUG: fix missed CMAKE to X11 variable name 2003-01-20 14:39:03 -05:00
Andy Cedilnik
69762f4d99 Fix FindX11 to match convention 2003-01-08 11:45:48 -05:00
Brad King
204308132f BUG: Fixed ordering of X11 search. 2003-01-02 09:57:42 -05:00
Sebastien Barre
309748ff79 FIX: make CMAKE_X_LIBS and CMAKE_X_CFLAGS advanced 2002-12-20 11:56:08 -05:00
Brad King
f433028b78 ENH: FindX11.cmake module now almost fully duplicates old configure functionality. 2002-12-17 11:55:54 -05:00
Bill Hoffman
fce9bf48c5 fix for nsl library and X11 2002-11-13 11:49:33 -05:00
Bill Hoffman
09b9a38ff3 fix for nsl library and X11 2002-11-13 11:36:04 -05:00
Will Schroeder
4b7b9ab2ec Backwards compatibility. Andy and Bill made me add socket library. 2002-11-12 16:27:24 -05:00
Andy Cedilnik
37b8509310 Make things advanced 2002-11-05 17:20:45 -05:00
Andy Cedilnik
8ac50c4aad Try to fix FindX11 2002-11-05 07:15:42 -05:00
Andy Cedilnik
2d9330fa1d Now it should work 2002-10-29 15:47:07 -05:00
Andy Cedilnik
b933ad875b This should substitute configure part that finds X11 2002-10-29 13:30:13 -05:00
Ian Scott
079e8469ab Hide lots of values in the advanced list
Fix some bugs
OpenGL always needs X11 on Unix
2002-09-05 12:00:45 -04:00
Ian Scott
0b288b6121 Fixed mistake in comments
Transferred OPENGL finding logic in from VXL
Added Some backwards compatibility with CMake1.4
2002-09-03 06:10:06 -04:00
Ian Scott
0b1465ba3a small bug fixes 2002-09-02 17:33:51 -04:00
Ian Scott
c826085917 Copied the X11 PNG and ZLIB functoinality from VXL 2002-09-02 15:46:04 -04:00
Sebastien Barre
64a1707aee ENH: clean modules (doc, make stuff advanced, etc.) 2002-06-14 16:49:00 -04:00
Luis Ibanez
9f7df4b56a Module to search for the installation of X11 2001-11-10 23:01:06 -05:00