summaryrefslogtreecommitdiffstats
path: root/Modules/FindX11.cmake
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-04-14 19:08:25 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-04-14 19:08:25 (GMT)
commitf7f05bee763b251f7ed9cb518a2f38d8664b955c (patch)
tree42e5cef9eb6a54c53b5938e786e041a555be4b33 /Modules/FindX11.cmake
parent54746bd923130cd66364b90e1498d07caa59ba48 (diff)
downloadCMake-f7f05bee763b251f7ed9cb518a2f38d8664b955c.zip
CMake-f7f05bee763b251f7ed9cb518a2f38d8664b955c.tar.gz
CMake-f7f05bee763b251f7ed9cb518a2f38d8664b955c.tar.bz2
ENH: make sure frameworks are not searched for x header files
Diffstat (limited to 'Modules/FindX11.cmake')
-rw-r--r--Modules/FindX11.cmake7
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 25d6e1e..e61dadf 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -6,7 +6,10 @@
IF (UNIX)
SET(X11_FOUND 0)
-
+ # X11 is never a framework and some header files may be
+ # found in tcl on the mac
+ SET(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
+ SET(CMAKE_FIND_FRAMEWORK NONE)
SET(X11_INC_SEARCH_PATH
/usr/X11R6/include
/usr/local/include
@@ -147,5 +150,5 @@ IF (UNIX)
X11_Xutil_INCLUDE_PATH
X11_LIBRARIES
)
-
+ SET(CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_SAVE})
ENDIF (UNIX)