diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-05-13 03:05:08 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-05-13 03:05:08 +0000 |
| commit | 5ca7674da3692509b0ee79aaee78d51b3a7d3c61 (patch) | |
| tree | 51ba816ed9974c528ccda4bf28c6c14b3e38a0ef | |
| parent | fa986f559dfa1374953925905dfd985ac1d3ebc7 (diff) | |
Updates to cmake project files (STR #813)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4345 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | fluid/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 5 |
3 files changed, 14 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 350c33fdf..c7fc4325f 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt index 9fc596842..c6f0e1a3e 100644 --- a/fluid/CMakeLists.txt +++ b/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 - align_widget.cxx - about_panel.cxx - widget_panel.cxx - alignment_panel.cxx + fluid.cxx function_panel.cxx + template_panel.cxx + undo.cxx + widget_panel.cxx ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 733858112..a275908bf 100644 --- a/src/CMakeLists.txt +++ b/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 |