From 48db7a07ef8e28dd4ab42b7bdc48669b503f354b Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Wed, 27 Jan 2016 23:57:53 +0000
Subject: Modify Xlib driver code not to #include source files.

Adjusted CMake build, and with some additional temporary #ifdef's
the old Linux Makefile system works as well.

Defined FL_LIBRARY_CMAKE for now - will be removed later.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11067 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/CMakeLists.txt | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ef9cd040..83fac14ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -147,6 +147,34 @@ set(CPPFILES
   fl_encoding_mac_roman.cxx
 )
 
+set(DRIVER_FILES)
+
+if (USE_X11)
+  # FILE(GLOB DRIVER_FILES drivers/Xlib/Fl_Xlib_Graphics_Driver_*.cxx)
+  set(DRIVER_FILES
+    drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx
+    drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx
+    drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
+    drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx
+    drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx
+    drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx
+  )
+  if (USE_XFT)
+    set(DRIVER_FILES ${DRIVER_FILES}
+      drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
+    )
+  else ()
+    set(DRIVER_FILES ${DRIVER_FILES}
+      drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx
+    )  
+  endif (USE_XFT)
+endif (USE_X11)
+
+set(CPPFILES
+  ${CPPFILES}
+  ${DRIVER_FILES}
+)
+
 set(FLCPPFILES
   forms_compatability.cxx
   forms_bitmap.cxx
@@ -197,7 +225,16 @@ set(CFILES
   fl_utf.c
 )
 
+# Add preprocessor macro FL_LIBRARY_CMAKE temporarily until the build
+# system transition is completed.
+# *** currently LINUX only ***
+
+if (UNIX)
+  add_definitions(-DFL_LIBRARY_CMAKE)
+endif (UNIX)
+
 add_definitions(-DFL_LIBRARY)
+
 if(APPLE AND NOT OPTION_APPLE_X11)
     set(MMFILES
         Fl_cocoa.mm
-- 
cgit v1.2.3