Don't link against the X11 libraries on Mac, because FLTK doesn't use them.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4524 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2cbc63ad7250d59b43d24f1ae1a085e73ce5369..0fdd3c661e2b078e0bf9a311466b42957c5317c2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,7 +119,7 @@ if(MINGW)
 endif()
 
 # X11 stuff. It's in a if() so that we can say REQUIRED
-if(UNIX)
+if(UNIX AND NOT APPLE)
   find_package(X11 REQUIRED)
 endif()
 
@@ -190,18 +190,20 @@ if(BUILD_NEW_VNCVIEWER)
   set(FLTK_SKIP_FORMS TRUE)
   find_package(FLTK COMPONENTS REQUIRED)
 
-  # No proper handling for extra X11 libs that FLTK might need...
-  if(X11_Xft_FOUND)
-    set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xft_LIB})
-  endif()
-  if(X11_Xinerama_FOUND)
-    set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xinerama_LIB})
-  endif()
-  if(X11_Xfixes_FOUND)
-    set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xfixes_LIB})
-  endif()
-  if(X11_Xcursor_FOUND)
-    set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xcursor_LIB})
+  if(NOT APPLE)
+    # No proper handling for extra X11 libs that FLTK might need...
+    if(X11_Xft_FOUND)
+      set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xft_LIB})
+    endif()
+    if(X11_Xinerama_FOUND)
+      set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xinerama_LIB})
+    endif()
+    if(X11_Xfixes_FOUND)
+      set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xfixes_LIB})
+    endif()
+    if(X11_Xcursor_FOUND)
+      set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xcursor_LIB})
+    endif()
   endif()
 
   set(CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR})