From 69ec698e41efbba438c1a758a63a097f19fa0a1f Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 31 Dec 2015 06:19:59 +0000
Subject: 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
---
 fluid/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'fluid')

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
-- 
cgit v1.2.3