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

6 files changed, 25 insertions, 15 deletions

diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index aa76375f4..fe9942575 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -102,7 +102,7 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
         fltk_wrap_ui(${tname} ${flsrcs})
     endif(flsrcs)
 
-    if(APPLE)
+    if(APPLE AND NOT OPTION_APPLE_X11)
       unset(RESOURCE_PATH)
       if(${tname} STREQUAL "blocks" OR ${tname} STREQUAL "checkers" OR ${tname} STREQUAL "sudoku")
         set( ICON_NAME ${tname}.icns )
@@ -121,7 +121,7 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
       endif(DEFINED RESOURCE_PATH)
     else()
       add_executable(${tname} WIN32 ${srcs} ${${tname}_FLTK_UI_SRCS})
-    endif(APPLE)
+    endif(APPLE AND NOT OPTION_APPLE_X11)
 
     set_target_properties(${tname}    
 	    PROPERTIES OUTPUT_NAME ${oname}
@@ -132,9 +132,9 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
       endif(NOT ${tname} STREQUAL "demo")
       set_target_properties(${tname} PROPERTIES RESOURCE ${RESOURCE_PATH})
     endif(APPLE AND DEFINED RESOURCE_PATH)
-    if(APPLE AND ${tname} STREQUAL "editor")
+    if(APPLE AND (NOT OPTION_APPLE_X11) AND ${tname} STREQUAL "editor")
       set_target_properties("editor" PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/ide/Xcode4/plists/editor-Info.plist" )
-    endif(APPLE AND ${tname} STREQUAL "editor")
+    endif(APPLE AND (NOT OPTION_APPLE_X11) AND ${tname} STREQUAL "editor")
     
 
     target_link_libraries(${tname} ${LIBRARIES})
diff --git a/CMake/options.cmake b/CMake/options.cmake
index 0aa687fef..49d94070c 100644
--- a/CMake/options.cmake
+++ b/CMake/options.cmake
@@ -128,6 +128,10 @@ if(HAVE_GL)
 endif(HAVE_GL)
 
 if(OPTION_USE_GL)
+   if(OPTION_APPLE_X11)
+     find_library(OPENGL_gl_LIBRARY GL)
+     find_library(OPENGL_glu_LIBRARY GLU)
+   endif(OPTION_APPLE_X11)
    include(FindOpenGL)
 endif(OPTION_USE_GL)
 
diff --git a/CMake/setup.cmake b/CMake/setup.cmake
index c3cd00d13..2befc1fa3 100644
--- a/CMake/setup.cmake
+++ b/CMake/setup.cmake
@@ -80,7 +80,7 @@ endif(NOT WIN32)
 # set where config files go
 if(WIN32 AND NOT CYGWIN)
    set(FLTK_CONFIG_PATH CMake)
-elseif(APPLE)
+elseif(APPLE AND NOT OPTION_APPLE_X11)
    set(FLTK_CONFIG_PATH FLTK/.framework/Resources/CMake)
 else()
    set(FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk)
@@ -90,15 +90,20 @@ include(TestBigEndian)
 TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
 
 if(APPLE)
-   set(__APPLE_QUARTZ__ 1)
    set(HAVE_STRCASECMP 1)
    set(HAVE_DIRENT_H 1)
    set(HAVE_SNPRINTF 1)
    set(HAVE_VSNPRINTF 1)
    set(HAVE_SCANDIR 1)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
-   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")
-   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa")
+   if(OPTION_APPLE_X11)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U__APPLE__")
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U__APPLE__")
+   else()
+     set(__APPLE_QUARTZ__ 1)
+     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")
+     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa")
+   endif(OPTION_APPLE_X11)
 endif(APPLE)
 
 if(WIN32)
diff --git a/README.CMake.txt b/README.CMake.txt
index f1b4de1b2..0b1acadb9 100644
--- a/README.CMake.txt
+++ b/README.CMake.txt
@@ -98,7 +98,8 @@ OPTION_ARCHFLAGS
    Extra architecture flags.
 
 OPTION_APPLE_X11 - default OFF
-   In case you want to use X11 on OSX.  Not currently supported.
+   In case you want to use X11 on OSX.
+   Use this only if you know what you do, and if you have installed X11.
 
 OPTION_USE_POLL - default OFF
    Don't use this one either.
diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
index 86c7fba13..87931114c 100644
--- a/fluid/CMakeLists.txt
+++ b/fluid/CMakeLists.txt
@@ -38,13 +38,13 @@ set(CPPFILES
     widget_panel.cxx
 )
 
-if(APPLE)
+if(APPLE AND NOT OPTION_APPLE_X11)
   set( ICON_NAME fluid.icns )
   set( ICON_PATH "${PROJECT_SOURCE_DIR}/fluid/Fluid.app/Contents/Resources/${ICON_NAME}" )
   add_executable(fluid MACOSX_BUNDLE ${CPPFILES} ${ICON_PATH})
 else()
   add_executable(fluid ${CPPFILES})
-endif(APPLE)
+endif(APPLE AND NOT OPTION_APPLE_X11)
 
 target_link_libraries(fluid fltk fltk_images fltk_forms)
 
@@ -61,7 +61,7 @@ if(HAVE_XRENDER)
    target_link_libraries(fluid ${X11_Xrender_LIB})
 endif(HAVE_XRENDER)
 
-if(APPLE)    
+if(APPLE AND NOT OPTION_APPLE_X11)
   set_target_properties(fluid PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME})
   set_target_properties(fluid PROPERTIES RESOURCE ${ICON_PATH})
   install(TARGETS fluid DESTINATION ${FLTK_BINDIR})
@@ -72,7 +72,7 @@ else()
     LIBRARY DESTINATION ${FLTK_LIBDIR}
     ARCHIVE DESTINATION ${FLTK_LIBDIR}
     )
-endif(APPLE)
+endif(APPLE AND NOT OPTION_APPLE_X11)
 
 if(UNIX)
     install(FILES fluid.desktop
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")