summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2015-12-31 06:19:59 +0000
committerManolo Gouy <Manolo>2015-12-31 06:19:59 +0000
commit69ec698e41efbba438c1a758a63a097f19fa0a1f (patch)
tree011720a8cf865dc951388bfde1d2fef7dd5f2528 /src
parent3beb45165a4e3aac8ab6a6a4add93eb4cd48eceb (diff)
Mac OS: modified CMake config files to allow use of OPTION_APPLE_X11
to build an X11-using version of FLTK on the Mac OS platform. This matches the recent support of the --enable-x11 option by the configure script on the mac. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10986 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6161b2379..6ef9cd040 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -198,7 +198,7 @@ set(CFILES
)
add_definitions(-DFL_LIBRARY)
-if(APPLE)
+if(APPLE AND NOT OPTION_APPLE_X11)
set(MMFILES
Fl_cocoa.mm
Fl_Quartz_Printer.mm
@@ -208,7 +208,7 @@ if(APPLE)
else()
set(MMFILES
)
-endif(APPLE)
+endif(APPLE AND NOT OPTION_APPLE_X11)
#######################################################################
FL_ADD_LIBRARY(fltk STATIC "${CPPFILES};${MMFILES};${CFILES};fl_call_main.c")