소스 검색

ENH: make sure frameworks are not searched for x header files

Bill Hoffman 19 년 전
부모
커밋
f7f05bee76
1개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 5 2
      Modules/FindX11.cmake

+ 5 - 2
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)