summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-06-24 12:37:54 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-06-24 12:37:54 (GMT)
commit1c63a67e561f017316082a8666bcfbbdc7bcd12b (patch)
tree480e63242f43bce3129f1434c29963f97de0e517 /Modules
parent4a60a7afabbfc0a64c177fa0cb7fab848ce64b4d (diff)
parent488d9682cc0974713315cae60a8dae793caefc6a (diff)
downloadCMake-1c63a67e561f017316082a8666bcfbbdc7bcd12b.zip
CMake-1c63a67e561f017316082a8666bcfbbdc7bcd12b.tar.gz
CMake-1c63a67e561f017316082a8666bcfbbdc7bcd12b.tar.bz2
Merge topic 'FindX11-OSX-10.8'
488d968 FindX11: Search in /opt/X11 for OS X 10.8 (#14232)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindX11.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 3cd3cef..131d979 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -68,6 +68,7 @@ if (UNIX)
/usr/openwin/include
/usr/openwin/share/include
/opt/graphics/OpenGL/include
+ /opt/X11/include
)
set(X11_LIB_SEARCH_PATH
@@ -75,6 +76,7 @@ if (UNIX)
/usr/X11R6/lib
/usr/X11R7/lib
/usr/openwin/lib
+ /opt/X11/lib
)
find_path(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH})