Updates to cmake project files (STR #813)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4345 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

CMakeLists.txt

@@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 # The FLTK version
 SET(FLTK_VERSION_MAJOR "1")
 SET(FLTK_VERSION_MINOR "1")
-SET(FLTK_VERSION_PATCH "5")
+SET(FLTK_VERSION_PATCH "7")
 SET(FLTK_VERSION "${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}")
 SET(FLTK_VERSION_FULL "${FLTK_VERSION}.${FLTK_VERSION_PATCH}")
 
@@ -227,6 +227,7 @@ ELSE(FLTK_USE_SYSTEM_PNG)
   MARK_AS_ADVANCED(PNG_LIBRARY)
   SUBDIRS(png)
   SET(HAVE_LIBPNG 1)
+  SET(HAVE_PNG_H 1)
   SET(PNG_LIBRARIES fltk_png)
   INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/png")
 ENDIF(FLTK_USE_SYSTEM_PNG)

fluid/CMakeLists.txt

@@ -1,20 +1,23 @@
 SET(CPPFILES
+	CodeEditor.cxx
 	Fl_Function_Type.cxx
-	Fl_Menu_Type.cxx
 	Fl_Group_Type.cxx
-	Fl_Widget_Type.cxx
+	Fl_Menu_Type.cxx
 	Fl_Type.cxx
+	Fl_Widget_Type.cxx
 	Fl_Window_Type.cxx
 	Fluid_Image.cxx
+	about_panel.cxx
+	align_widget.cxx
+	alignment_panel.cxx
 	code.cxx
 	factory.cxx
 	file.cxx
-      fluid.cxx
+	fluid.cxx
-	align_widget.cxx
-	about_panel.cxx
-	widget_panel.cxx
-	alignment_panel.cxx
 	function_panel.cxx
+	template_panel.cxx
+	undo.cxx
+	widget_panel.cxx
 )
 
 

src/CMakeLists.txt

@@ -30,6 +30,7 @@ SET(CPPFILES
   Fl_Menu.cxx
   Fl_Menu_.cxx
   Fl_Menu_Bar.cxx
+	Fl_Sys_Menu_Bar.cxx
   Fl_Menu_Button.cxx
   Fl_Menu_Window.cxx
   Fl_Menu_add.cxx
@@ -121,8 +122,8 @@ SET(CPPFILES
   fl_show_colormap.cxx
   fl_symbols.cxx
   fl_vertex.cxx
+	screen_xywh.cxx
   )
-
 SET(FLCPPFILES
   forms_compatability.cxx
   forms_bitmap.cxx
@@ -131,7 +132,6 @@ SET(FLCPPFILES
   forms_pixmap.cxx
   forms_timer.cxx
   )
-
 SET(GLCPPFILES
   Fl_Gl_Choice.cxx
   Fl_Gl_Overlay.cxx
@@ -141,7 +141,6 @@ SET(GLCPPFILES
   glut_compatability.cxx
   glut_font.cxx
   )
-
 SET(IMGCPPFILES
   fl_images_core.cxx
   Fl_BMP_Image.cxx