From f7f05bee763b251f7ed9cb518a2f38d8664b955c Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 14 Apr 2006 15:08:25 -0400 Subject: [PATCH] ENH: make sure frameworks are not searched for x header files --- Modules/FindX11.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake index 25d6e1e42..e61dadf1e 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)