diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-06-23 19:12:08 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-06-23 19:12:08 +0000 |
| commit | 1b7abb9acf72860e8d550dbc49419316671d96d1 (patch) | |
| tree | a72b781c9672a1df7dffef38d6f6021ef4675261 | |
| parent | de22ae92b3698091a6e1d790eef46c664f086b82 (diff) | |
| download | tigervnc-1b7abb9acf72860e8d550dbc49419316671d96d1.tar.gz tigervnc-1b7abb9acf72860e8d550dbc49419316671d96d1.zip | |
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
| -rw-r--r-- | CMakeLists.txt | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b2cbc63a..0fdd3c66 100644 --- 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}) |