Author: AlbrechtS
Date: 2009-08-30 14:15:43 -0700 (Sun, 30 Aug 2009)
New Revision: 6847
Log:
More CMake updates (STR #2244):

 - added missing files in src/CMakeLists.txt
 - added -DUSE_X11 for Unix builds
 - added new test/unittests program

Thanks to Yassine (yostane) for testing and helping to update the CMake files.


Modified:
   branches/branch-1.3/CMakeLists.txt
   branches/branch-1.3/src/CMakeLists.txt
   branches/branch-1.3/test/CMakeLists.txt

Modified: branches/branch-1.3/CMakeLists.txt
===================================================================
--- branches/branch-1.3/CMakeLists.txt  2009-08-30 03:45:52 UTC (rev 6846)
+++ branches/branch-1.3/CMakeLists.txt  2009-08-30 21:15:43 UTC (rev 6847)
@@ -61,6 +61,7 @@
 
 IF(UNIX)
   FIND_PACKAGE(X11)
+  ADD_DEFINITIONS(-DUSE_X11)
   SET( FLTK_PLATFORM_DEPENDENT_LIBS ${X11_LIBRARIES} -lm)
 ENDIF(UNIX)
 

Modified: branches/branch-1.3/src/CMakeLists.txt
===================================================================
--- branches/branch-1.3/src/CMakeLists.txt      2009-08-30 03:45:52 UTC (rev 
6846)
+++ branches/branch-1.3/src/CMakeLists.txt      2009-08-30 21:15:43 UTC (rev 
6847)
@@ -126,6 +126,8 @@
   fl_vertex.cxx
   screen_xywh.cxx
   fl_utf8.cxx
+  fl_encoding_latin1.cxx
+  fl_encoding_mac_roman.cxx
   )
 SET(FLCPPFILES
   forms_compatability.cxx
@@ -171,6 +173,7 @@
   xutf8/utf8Input.c
   xutf8/utf8Utils.c
   xutf8/utf8Wrap.c
+  xutf8/keysym2Ucs.c
   fl_utf.c
   )
 

Modified: branches/branch-1.3/test/CMakeLists.txt
===================================================================
--- branches/branch-1.3/test/CMakeLists.txt     2009-08-30 03:45:52 UTC (rev 
6846)
+++ branches/branch-1.3/test/CMakeLists.txt     2009-08-30 21:15:43 UTC (rev 
6847)
@@ -83,6 +83,7 @@
 CREATE_EXAMPLE(tile tile.cxx fltk)
 CREATE_EXAMPLE(tiled_image tiled_image.cxx fltk)
 CREATE_EXAMPLE(valuators valuators.fl fltk)
+CREATE_EXAMPLE(unittests unittests.cxx fltk)
 
 # OpenGL demos...
 IF(OPENGL_FOUND)

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to