[Avida-SVN] r1767 - in development: . CMakeModules source/targets/viewer-fltk

[ofria at myxo.css.msu.edu]

Author: ofria
Date: 2007-07-09 17:44:47 -0400 (Mon, 09 Jul 2007)
New Revision: 1767

Added:
   development/CMakeModules/FindFLTK.cmake
Modified:
   development/CMakeLists.txt
   development/source/targets/viewer-fltk/viewer-fltk.cc
Log:
Setup barebones of FLTK viewer.  CMake still needs some updating to get this to compile correctly.


Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt	2007-07-09 18:24:41 UTC (rev 1766)
+++ development/CMakeLists.txt	2007-07-09 21:44:47 UTC (rev 1767)
@@ -478,9 +478,7 @@
     
     SET(AVIDA_FLTK_VIEWER_DIR source/targets/viewer-fltk)
     SET(AVIDA_FLTK_VIEWER_SOURCES
-#      ${AVIDA_FLTK_VIEWER_DIR}/cFltkViewerAnalyzeDriver.cc
-#      ${AVIDA_FLTK_VIEWER_DIR}/cFltkViewerDriver.cc
-#      ${AVIDA_FLTK_VIEWER_DIR}/cFltkViewerDriver_Base.cc
+      ${AVIDA_FLTK_VIEWER_DIR}/cDriver_FltkViewer.cc
       ${AVIDA_FLTK_VIEWER_DIR}/viewer-fltk.cc
     )
     SOURCE_GROUP(targets\\viewer-fltk FILES ${AVIDA_FLTK_VIEWER_SOURCES})

Added: development/CMakeModules/FindFLTK.cmake
===================================================================
--- development/CMakeModules/FindFLTK.cmake	                        (rev 0)
+++ development/CMakeModules/FindFLTK.cmake	2007-07-09 21:44:47 UTC (rev 1767)
@@ -0,0 +1,63 @@
+# - Find the native FLTK includes and library
+# The following settings are defined
+#  FLTK_FLUID_EXECUTABLE, where to find the Fluid tool
+#  FLTK_WRAP_UI, This enables the FLTK_WRAP_UI command
+#  FLTK_INCLUDE_DIR, where to find include files
+#  FLTK_LIBRARIES, list of fltk libraries
+#  FLTK_FOUND, Don't use FLTK if false.
+# The following settings should not be used in general.
+#  FLTK_BASE_LIBRARY   = the full path to fltk.lib
+#  FLTK_GL_LIBRARY     = the full path to fltk_gl.lib
+#  FLTK_FORMS_LIBRARY  = the full path to fltk_forms.lib
+#  FLTK_IMAGES_LIBRARY = the full path to fltk_images.lib
+
+#  Platform dependent libraries required by FLTK
+IF(WIN32)
+  IF(NOT CYGWIN)
+    IF(BORLAND)
+      SET( FLTK_PLATFORM_DEPENDENT_LIBS import32 )
+    ELSE(BORLAND)
+      SET( FLTK_PLATFORM_DEPENDENT_LIBS wsock32 comctl32 )
+    ENDIF(BORLAND)
+  ENDIF(NOT CYGWIN)
+ENDIF(WIN32)
+
+IF(UNIX)
+  INCLUDE(${CMAKE_ROOT}/Modules/FindX11.cmake)
+  SET( FLTK_PLATFORM_DEPENDENT_LIBS ${X11_LIBRARIES} -lm)
+ENDIF(UNIX)
+
+IF(APPLE)
+  SET( FLTK_PLATFORM_DEPENDENT_LIBS  "-framework Carbon -framework Cocoa -framework ApplicationServices -lz")
+ENDIF(APPLE)
+
+IF(CYGWIN)
+  SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 wsock32 supc++ -lm -lgdi32)
+ENDIF(CYGWIN)
+
+
+FIND_PATH(FLTK_INCLUDE_PATH FL
+  # Look for an environment variable FLTK_DIR.
+  $ENV{FLTK_DIR}
+  
+  # Look in places relative to the system executable search path.
+  ${FLTK_DIR_SEARCH}
+  
+  # Look in standard UNIX install locations.
+  /usr/local/include
+  /usr/include
+  /usr/local/fltk
+  /usr/X11R6/include
+  
+  # Help the user find it if we cannot.
+  DOC "The ${FLTK_DIR_STRING}"
+  )
+
+FIND_LIBRARY(FLTK_BASE_LIBRARY
+  NAMES fltk
+  PATHS /usr/local/lib /usr/lib /lib
+  )
+FIND_LIBRARY(XEXT_LIBRARY
+  NAMES Xext
+  PATHS /usr/local/lib /usr/lib /lib /usr/X11R6/lib
+  )

Modified: development/source/targets/viewer-fltk/viewer-fltk.cc
===================================================================
--- development/source/targets/viewer-fltk/viewer-fltk.cc	2007-07-09 18:24:41 UTC (rev 1766)
+++ development/source/targets/viewer-fltk/viewer-fltk.cc	2007-07-09 21:44:47 UTC (rev 1767)
@@ -30,7 +30,7 @@
 #include "PlatformExpert.h"
 #include "cWorld.h"
 
-#include "cDriver_TextViewer.h"
+#include "cDriver_FLTKViewer.h"
 
 
 using namespace std;