summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2009-09-09 21:37:51 +0000
committerMatthias Melcher <fltk@matthiasm.com>2009-09-09 21:37:51 +0000
commit2245a9887314f5ebd9765faeb162bc8ec78cc62c (patch)
tree116e8ff5896e2139f6b4bf540ff124cb81c15d67 /CMakeLists.txt
parenta3d42a78b170c30b8a2645040fd31ced7a6a207a (diff)
Made CMake work on OS X Snow Leopard by removing the assumption that a Unix system (which includes OS X) automatically is an X11 system (which OS X is not).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6857 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27e36756a..2520f910c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ IF(WIN32)
ENDIF(NOT CYGWIN)
ENDIF(WIN32)
+# OS X with X11 is not currently supported!
SET(FLTK_X11 1)
SET(FLTK_APPLE 0)
IF(APPLE)
@@ -59,7 +60,7 @@ IF(APPLE)
ENDIF(NOT FLTK_APPLE_X11)
ENDIF(APPLE)
-IF(UNIX)
+IF(UNIX AND NOT APPLE)
FIND_PACKAGE(X11)
ADD_DEFINITIONS(-DUSE_X11)
SET( FLTK_PLATFORM_DEPENDENT_LIBS ${X11_LIBRARIES} -lm)