[Xfce4-commits] <xfc:master> make library build more cmake freindly

Bo Lorensen noreply at xfce.org
Wed Sep 7 20:32:02 CEST 2011


Updating branch refs/heads/master
         to a46c90dd0214094538a3ec2aa19b369636d48628 (commit)
       from 5c873d05c9fbafa4db4d8d822c277927fd16624a (commit)

commit a46c90dd0214094538a3ec2aa19b369636d48628
Author: Bo Lorensen <bl at lue.dk>
Date:   Mon Aug 15 00:07:50 2011 +0200

    make library build more cmake freindly

 CMakeLists.txt                                |    4 ++
 core/CMakeLists.txt                           |    3 ++
 core/xfc/CMakeLists.txt                       |   46 ++++++++++++++++++++++---
 core/xfc/glib/CMakeLists.txt                  |    9 -----
 demos/CMakeLists.txt                          |    3 ++
 demos/xfc-demo/CMakeLists.txt                 |   16 +++++++++
 examples/CMakeLists.txt                       |   11 ++++++
 examples/core/CMakeLists.txt                  |    6 +++
 examples/core/iochannel/CMakeLists.txt        |    5 +++
 examples/core/mainloop/CMakeLists.txt         |    5 +++
 examples/core/spawn/CMakeLists.txt            |    5 +++
 examples/core/threads/CMakeLists.txt          |   17 +++++++++
 examples/howto/CMakeLists.txt                 |   38 ++++++++++++++++++++
 examples/howto/actions/CMakeLists.txt         |    5 +++
 examples/howto/arrow/CMakeLists.txt           |    5 +++
 examples/howto/aspectframe/CMakeLists.txt     |    5 +++
 examples/howto/buttonbox/CMakeLists.txt       |    5 +++
 examples/howto/buttons/CMakeLists.txt         |    5 +++
 examples/howto/calendar/CMakeLists.txt        |    5 +++
 examples/howto/colorselection/CMakeLists.txt  |    5 +++
 examples/howto/combobox/CMakeLists.txt        |    9 +++++
 examples/howto/dial/CMakeLists.txt            |    5 +++
 examples/howto/dnd/CMakeLists.txt             |    5 +++
 examples/howto/drawingarea/CMakeLists.txt     |    9 +++++
 examples/howto/entry/CMakeLists.txt           |    5 +++
 examples/howto/entrycompletion/CMakeLists.txt |    5 +++
 examples/howto/eventbox/CMakeLists.txt        |    5 +++
 examples/howto/fixed/CMakeLists.txt           |    5 +++
 examples/howto/fontselection/CMakeLists.txt   |    5 +++
 examples/howto/frame/CMakeLists.txt           |    5 +++
 examples/howto/label/CMakeLists.txt           |    5 +++
 examples/howto/menu/CMakeLists.txt            |    9 +++++
 examples/howto/notebook/CMakeLists.txt        |    5 +++
 examples/howto/packbox/CMakeLists.txt         |    5 +++
 examples/howto/paned/CMakeLists.txt           |    5 +++
 examples/howto/progressbar/CMakeLists.txt     |    5 +++
 examples/howto/radiobuttons/CMakeLists.txt    |    5 +++
 examples/howto/rangewidgets/CMakeLists.txt    |    5 +++
 examples/howto/rulers/CMakeLists.txt          |    5 +++
 examples/howto/scrolledwindow/CMakeLists.txt  |    5 +++
 examples/howto/selection/CMakeLists.txt       |    5 +++
 examples/howto/spinbutton/CMakeLists.txt      |    5 +++
 examples/howto/statusbar/CMakeLists.txt       |    5 +++
 examples/howto/table/CMakeLists.txt           |    5 +++
 examples/howto/textview/CMakeLists.txt        |    5 +++
 examples/howto/thread/CMakeLists.txt          |    5 +++
 examples/howto/tictactoe/CMakeLists.txt       |    5 +++
 examples/howto/toolbar/CMakeLists.txt         |    5 +++
 examples/howto/treeview/CMakeLists.txt        |    5 +++
 examples/ui/CMakeLists.txt                    |   10 +++++
 examples/ui/actions/CMakeLists.txt            |    5 +++
 examples/ui/cairo/CMakeLists.txt              |    5 +++
 examples/ui/combobox/CMakeLists.txt           |    5 +++
 examples/ui/entrycompletion/CMakeLists.txt    |    5 +++
 examples/ui/filechooser/CMakeLists.txt        |    5 +++
 examples/ui/mergemenus/CMakeLists.txt         |    5 +++
 examples/ui/printing/CMakeLists.txt           |    5 +++
 examples/ui/toolbar/CMakeLists.txt            |    5 +++
 ui/xfc/CMakeLists.txt                         |    8 +++-
 ui/xfc/atk/CMakeLists.txt                     |   11 ++++--
 ui/xfc/cairo/CMakeLists.txt                   |   11 ++++--
 ui/xfc/gdk-pixbuf/CMakeLists.txt              |   11 ++++--
 ui/xfc/gdk/CMakeLists.txt                     |   11 ++++--
 ui/xfc/gtk/CMakeLists.txt                     |   10 ++++--
 ui/xfc/pango/CMakeLists.txt                   |   11 ++++--
 65 files changed, 449 insertions(+), 34 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69316ec..ee2d853 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,10 +8,14 @@ SET( XFC_MAJOR_VERSION 4 )
 SET( XFC_MINOR_VERSION 6 )
 SET( XFC_MICRO_VERSION 0 )
 
+SET( XFC_VERSION "${XFC_MAJOR_VERSION}.${XFC_MINOR_VERSION}.${XFC_MICRO_VERSION}")
+
 ADD_SUBDIRECTORY( core )
 ADD_SUBDIRECTORY( ui )
 #ADD_SUBDIRECTORY( glade )
 ADD_SUBDIRECTORY( de )
 #ADD_SUBDIRECTORY( sourceview )
+ADD_SUBDIRECTORY( demos )
+ADD_SUBDIRECTORY( examples )
 
 CONFIGURE_FILE( xfc-config.h.in xfc-config.h )
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index b74dde2..ba17d11 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -2,5 +2,8 @@ PROJECT( XFC_CORE )
 
 pkg_search_module( GLIB REQUIRED glib-2.0) 
 pkg_search_module( SIGC REQUIRED sigc++-2.0)
+pkg_search_module( GOJB REQUIRED gobject-2.0)
+pkg_search_module( GMOD REQUIRED gmodule-2.0) 
+pkg_search_module( GTHR REQUIRED gthread-2.0)
 
 ADD_SUBDIRECTORY( xfc )
diff --git a/core/xfc/CMakeLists.txt b/core/xfc/CMakeLists.txt
index 9090cba..7f9c7df 100644
--- a/core/xfc/CMakeLists.txt
+++ b/core/xfc/CMakeLists.txt
@@ -1,10 +1,46 @@
-ADD_SUBDIRECTORY( glib )
+INCLUDE_DIRECTORIES( ${GLIB_INCLUDE_DIRS} ${GOJB_INCLUDE_DIRS} ${GMOD_INCLUDE_DIRS} ${GTHR_INCLUDE_DIRS} 
+	${SIGC_INCLUDE_DIRS} ${XFC_CORE_SOURCE_DIR})
 
-INCLUDE_DIRECTORIES( ${GLIB_INCLUDE_DIRS} ${SIGC_INCLUDE_DIRS} ${XFC_CORE_SOURCE_DIR})
+INCLUDE_DIRECTORIES( ${SIGC_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${XFC_SOURCE_DIR} ${XFC_CORE_SOURCE_DIR} )
+
+SET( glib_files 
+ glib/asyncqueue.cc 
+ glib/boxed.cc 
+ glib/completion.cc 
+ glib/connection.cc 
+ glib/date.cc 
+ glib/error.cc 
+ glib/fileutils.cc 
+ glib/iochannel.cc 
+ glib/keyfile.cc 
+ glib/main.cc 
+ glib/markup.cc 
+ glib/marshal.cc 
+ glib/module.cc 
+ glib/mutex.cc 
+ glib/object.cc 
+ glib/objectsignals.cc 
+ glib/option.cc 
+ glib/pattern.cc 
+ glib/property.cc 
+ glib/quark.cc 
+ glib/rand.cc 
+ glib/scanner.cc 
+ glib/shell.cc 
+ glib/signals.cc 
+ glib/spawn.cc 
+ glib/thread.cc 
+ glib/threadpool.cc 
+ glib/timer.cc 
+ glib/timeval.cc 
+ glib/type.cc 
+ glib/unicode.cc 
+ glib/utils.cc 
+ glib/value.cc)
 
 ADD_LIBRARY( xfc_core SHARED convert.cc i18n.cc object.cc stackobject.cc trackable.cc 
- utfstring.cc version.cc)
+ utfstring.cc version.cc ${glib_files})
 
-TARGET_LINK_LIBRARIES( xfc_core xfc_glib ${GLIB_LIBRARIES} ${SIGC_LIBRARIES})
+TARGET_LINK_LIBRARIES( xfc_core ${GLIB_LIBRARIES} ${GOBJ_LIBRARIES} ${GMOD_LIBRARIES} ${GTHR_LIBRARIES} ${SIGC_LIBRARIES})
 
-ADD_DEPENDENCIES( xfc_core xfc_glib )
+#SET_TARGET_PROPERTIES( xfc_core PROPERTIES LINK_INTERFACE_LIBRARIES "")
diff --git a/core/xfc/glib/CMakeLists.txt b/core/xfc/glib/CMakeLists.txt
deleted file mode 100644
index 11cb499..0000000
--- a/core/xfc/glib/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-INCLUDE_DIRECTORIES( ${SIGC_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${XFC_SOURCE_DIR} ${XFC_CORE_SOURCE_DIR} )
-
-ADD_DEFINITIONS( -fPIC )
-
-ADD_LIBRARY( xfc_glib STATIC asyncqueue.cc boxed.cc completion.cc connection.cc date.cc 
- error.cc fileutils.cc iochannel.cc keyfile.cc main.cc markup.cc marshal.cc module.cc 
- mutex.cc object.cc objectsignals.cc option.cc pattern.cc property.cc quark.cc rand.cc 
- scanner.cc shell.cc signals.cc spawn.cc thread.cc threadpool.cc timer.cc timeval.cc 
- type.cc unicode.cc utils.cc value.cc)
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
new file mode 100644
index 0000000..d9b3fab
--- /dev/null
+++ b/demos/CMakeLists.txt
@@ -0,0 +1,3 @@
+PROJECT( XFC_DEMOS )
+
+ADD_SUBDIRECTORY( xfc-demo )
diff --git a/demos/xfc-demo/CMakeLists.txt b/demos/xfc-demo/CMakeLists.txt
new file mode 100644
index 0000000..baff764
--- /dev/null
+++ b/demos/xfc-demo/CMakeLists.txt
@@ -0,0 +1,16 @@
+INCLUDE_DIRECTORIES( ${XFC_UI_SOURCE_DIR} ${XFC_CORE_SOURCE_DIR}
+    ${GLIB_INCLUDE_DIRS} ${SIGC_INCLUDE_DIRS} ${GDK_INCLUDE_DIRS}
+    ${GTK_INCLUDE_DIRS} ${XFC_SOURCE_DIR})
+
+ADD_DEFINITIONS( -DDEMOCODEDIR="${XFC_DEMOS_SOURCE_DIR}/xfc-demo" )
+
+ADD_EXECUTABLE( xfc-demo main.cc demowindow.cc appwindow.cc button_box.cc changedisplay.cc clipboard.cc colorsel.cc 
+ dialog.cc drawingarea.cc entry_completion.cc expander.cc hypertext.cc iconview.cc images.cc 
+ menus.cc panes.cc pixbufs.cc rotated_text.cc sizegroup.cc stock_browser.cc textview.cc editable_cells.cc
+ list_store.cc tree_store.cc ui_manager.cc)
+
+TARGET_LINK_LIBRARIES( xfc-demo xfc_ui )
+
+SET( IMAGEFILES alphatest.png apple-red.png background.jpg floppybuddy.gif gnome-applets.png
+ gnome-calendar.png gnome-fs-directory.png gnome-foot.png gnome-gimp.png gnome-gmush.png gnome-gsame.png
+ gnome-fs-regular.png gnu-keys.png gtk-logo-rgb.gif)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000..d96754b
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,11 @@
+## xfc examples directory
+INCLUDE_DIRECTORIES( ${XFC_UI_SOURCE_DIR} ${XFC_CORE_SOURCE_DIR}
+    ${GLIB_INCLUDE_DIRS} ${SIGC_INCLUDE_DIRS} ${GDK_INCLUDE_DIRS}
+    ${GTK_INCLUDE_DIRS} ${XFC_SOURCE_DIR})
+
+ADD_SUBDIRECTORY( core )
+ADD_SUBDIRECTORY( howto )
+ADD_SUBDIRECTORY( ui )
+#ADD_SUBDIRECTORY( tutorial )
+
+# @GLADE_EXAMPLESDIR@ @SOURCEVIEW_EXAMPLEDIR@
diff --git a/examples/core/CMakeLists.txt b/examples/core/CMakeLists.txt
new file mode 100644
index 0000000..b5ba1db
--- /dev/null
+++ b/examples/core/CMakeLists.txt
@@ -0,0 +1,6 @@
+## xfc examples/core directory
+
+ADD_SUBDIRECTORY( iochannel )
+ADD_SUBDIRECTORY( mainloop ) 
+ADD_SUBDIRECTORY( spawn )
+ADD_SUBDIRECTORY( threads )
diff --git a/examples/core/iochannel/CMakeLists.txt b/examples/core/iochannel/CMakeLists.txt
new file mode 100644
index 0000000..ec49344
--- /dev/null
+++ b/examples/core/iochannel/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/core/iochannel directory
+
+ADD_EXECUTABLE( iochannel iochannel.cc )
+
+TARGET_LINK_LIBRARIES( iochannel xfc_ui )
diff --git a/examples/core/mainloop/CMakeLists.txt b/examples/core/mainloop/CMakeLists.txt
new file mode 100644
index 0000000..f1a743f
--- /dev/null
+++ b/examples/core/mainloop/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/core/mainloop directory
+
+ADD_EXECUTABLE( mainloop mainloop.cc )
+
+TARGET_LINK_LIBRARIES( mainloop xfc_ui )
diff --git a/examples/core/spawn/CMakeLists.txt b/examples/core/spawn/CMakeLists.txt
new file mode 100644
index 0000000..625d023
--- /dev/null
+++ b/examples/core/spawn/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/core/spawn directory
+
+ADD_EXECUTABLE(spawn spawn.cc)
+
+TARGET_LINK_LIBRARIES( spawn xfc_ui )
diff --git a/examples/core/threads/CMakeLists.txt b/examples/core/threads/CMakeLists.txt
new file mode 100644
index 0000000..25b94d4
--- /dev/null
+++ b/examples/core/threads/CMakeLists.txt
@@ -0,0 +1,17 @@
+## xfc examples/core/threads directory
+
+ADD_EXECUTABLE( complex_thread complex-thread.cc)
+
+TARGET_LINK_LIBRARIES( complex_thread xfc_ui )
+
+ADD_EXECUTABLE( multiple_thread multiple-thread.cc)
+
+TARGET_LINK_LIBRARIES( multiple_thread xfc_ui )
+
+ADD_EXECUTABLE( simple_thread simple-thread.cc)
+
+TARGET_LINK_LIBRARIES( simple_thread  xfc_ui )
+
+ADD_EXECUTABLE( threadpool threadpool.cc )
+
+TARGET_LINK_LIBRARIES( threadpool xfc_ui )
diff --git a/examples/howto/CMakeLists.txt b/examples/howto/CMakeLists.txt
new file mode 100644
index 0000000..7ae2e6b
--- /dev/null
+++ b/examples/howto/CMakeLists.txt
@@ -0,0 +1,38 @@
+## xfc examples/howto directory
+
+ADD_SUBDIRECTORY( actions )
+ADD_SUBDIRECTORY( arrow )
+ADD_SUBDIRECTORY( aspectframe )
+ADD_SUBDIRECTORY( buttonbox )
+ADD_SUBDIRECTORY( buttons )
+ADD_SUBDIRECTORY( calendar )
+ADD_SUBDIRECTORY( colorselection )
+ADD_SUBDIRECTORY( combobox )
+ADD_SUBDIRECTORY( dial )
+ADD_SUBDIRECTORY( dnd )
+ADD_SUBDIRECTORY( drawingarea )
+ADD_SUBDIRECTORY( entry )
+ADD_SUBDIRECTORY( entrycompletion )
+ADD_SUBDIRECTORY( eventbox )
+ADD_SUBDIRECTORY( fixed )
+ADD_SUBDIRECTORY( fontselection )
+ADD_SUBDIRECTORY( frame )
+ADD_SUBDIRECTORY( label )
+ADD_SUBDIRECTORY( menu )
+ADD_SUBDIRECTORY( notebook )
+ADD_SUBDIRECTORY( packbox )
+ADD_SUBDIRECTORY( paned )
+ADD_SUBDIRECTORY( progressbar )
+ADD_SUBDIRECTORY( radiobuttons )
+ADD_SUBDIRECTORY( rangewidgets )
+ADD_SUBDIRECTORY( rulers )
+ADD_SUBDIRECTORY( scrolledwindow )
+ADD_SUBDIRECTORY( selection )
+ADD_SUBDIRECTORY( spinbutton )
+ADD_SUBDIRECTORY( statusbar )
+ADD_SUBDIRECTORY( table )
+ADD_SUBDIRECTORY( textview )
+ADD_SUBDIRECTORY( thread )
+ADD_SUBDIRECTORY( tictactoe )
+ADD_SUBDIRECTORY( toolbar )
+ADD_SUBDIRECTORY( treeview )
diff --git a/examples/howto/actions/CMakeLists.txt b/examples/howto/actions/CMakeLists.txt
new file mode 100644
index 0000000..b3097a8
--- /dev/null
+++ b/examples/howto/actions/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/actions directory
+
+ADD_EXECUTABLE( actions actions.cc )
+
+TARGET_LINK_LIBRARIES( actions xfc_ui )
diff --git a/examples/howto/arrow/CMakeLists.txt b/examples/howto/arrow/CMakeLists.txt
new file mode 100644
index 0000000..e91f2ac
--- /dev/null
+++ b/examples/howto/arrow/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/arrow directory
+
+ADD_EXECUTABLE( arrow arrow.cc )
+
+TARGET_LINK_LIBRARIES( arrow xfc_ui )
diff --git a/examples/howto/aspectframe/CMakeLists.txt b/examples/howto/aspectframe/CMakeLists.txt
new file mode 100644
index 0000000..cdcc4e1
--- /dev/null
+++ b/examples/howto/aspectframe/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/aspectframe directory
+
+ADD_EXECUTABLE( aspectframe aspectframe.cc )
+
+TARGET_LINK_LIBRARIES( aspectframe xfc_ui )
diff --git a/examples/howto/buttonbox/CMakeLists.txt b/examples/howto/buttonbox/CMakeLists.txt
new file mode 100644
index 0000000..2e81dc7
--- /dev/null
+++ b/examples/howto/buttonbox/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/buttonbox directory
+
+ADD_EXECUTABLE( buttonbox buttonbox.cc )
+
+TARGET_LINK_LIBRARIES( buttonbox xfc_ui )
diff --git a/examples/howto/buttons/CMakeLists.txt b/examples/howto/buttons/CMakeLists.txt
new file mode 100644
index 0000000..9116fe2
--- /dev/null
+++ b/examples/howto/buttons/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/buttons directory
+
+ADD_EXECUTABLE( buttons buttons.cc )
+
+TARGET_LINK_LIBRARIES( buttons xfc_ui )
diff --git a/examples/howto/calendar/CMakeLists.txt b/examples/howto/calendar/CMakeLists.txt
new file mode 100644
index 0000000..b3bff00
--- /dev/null
+++ b/examples/howto/calendar/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/calendar directory
+
+ADD_EXECUTABLE( calendar calendar.cc )
+
+TARGET_LINK_LIBRARIES( calendar xfc_ui )
diff --git a/examples/howto/colorselection/CMakeLists.txt b/examples/howto/colorselection/CMakeLists.txt
new file mode 100644
index 0000000..08ade8d
--- /dev/null
+++ b/examples/howto/colorselection/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/colorselection directory
+
+ADD_EXECUTABLE( colorselection colorselection.cc )
+
+TARGET_LINK_LIBRARIES( colorselection xfc_ui )
diff --git a/examples/howto/combobox/CMakeLists.txt b/examples/howto/combobox/CMakeLists.txt
new file mode 100644
index 0000000..e02a4f3
--- /dev/null
+++ b/examples/howto/combobox/CMakeLists.txt
@@ -0,0 +1,9 @@
+## xfc examples/howto/combobox directory
+
+ADD_EXECUTABLE( combobox combobox.cc )
+
+TARGET_LINK_LIBRARIES( combobox xfc_ui )
+
+ADD_EXECUTABLE( comboboxentry comboboxentry.cc )
+
+TARGET_LINK_LIBRARIES( comboboxentry xfc_ui )
diff --git a/examples/howto/dial/CMakeLists.txt b/examples/howto/dial/CMakeLists.txt
new file mode 100644
index 0000000..d4214bc
--- /dev/null
+++ b/examples/howto/dial/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/dial directory
+
+ADD_EXECUTABLE( dial_test dial.cc dial_test.cc )
+
+TARGET_LINK_LIBRARIES( dial_test xfc_ui )
diff --git a/examples/howto/dnd/CMakeLists.txt b/examples/howto/dnd/CMakeLists.txt
new file mode 100644
index 0000000..02864fb
--- /dev/null
+++ b/examples/howto/dnd/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/dnd directory
+
+ADD_EXECUTABLE( dnd dnd.cc )
+
+TARGET_LINK_LIBRARIES( dnd xfc_ui )
diff --git a/examples/howto/drawingarea/CMakeLists.txt b/examples/howto/drawingarea/CMakeLists.txt
new file mode 100644
index 0000000..ab60aa3
--- /dev/null
+++ b/examples/howto/drawingarea/CMakeLists.txt
@@ -0,0 +1,9 @@
+## xfc examples/howto/drawingarea directory
+
+ADD_EXECUTABLE( scribble scribble.cc )
+
+TARGET_LINK_LIBRARIES( scribble xfc_ui )
+ 
+ADD_EXECUTABLE( simple simple.cc )
+
+TARGET_LINK_LIBRARIES( simple xfc_ui )
diff --git a/examples/howto/entry/CMakeLists.txt b/examples/howto/entry/CMakeLists.txt
new file mode 100644
index 0000000..5708ea6
--- /dev/null
+++ b/examples/howto/entry/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/entry directory
+
+ADD_EXECUTABLE( entry entry.cc )
+
+TARGET_LINK_LIBRARIES( entry xfc_ui )
diff --git a/examples/howto/entrycompletion/CMakeLists.txt b/examples/howto/entrycompletion/CMakeLists.txt
new file mode 100644
index 0000000..ade386c
--- /dev/null
+++ b/examples/howto/entrycompletion/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/entrycompletion directory
+
+ADD_EXECUTABLE( entrycompletion entrycompletion.cc )
+
+TARGET_LINK_LIBRARIES( entrycompletion xfc_ui )
diff --git a/examples/howto/eventbox/CMakeLists.txt b/examples/howto/eventbox/CMakeLists.txt
new file mode 100644
index 0000000..92f5421
--- /dev/null
+++ b/examples/howto/eventbox/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/eventbox directory
+
+ADD_EXECUTABLE( eventbox eventbox.cc )
+
+TARGET_LINK_LIBRARIES( eventbox xfc_ui )
diff --git a/examples/howto/fixed/CMakeLists.txt b/examples/howto/fixed/CMakeLists.txt
new file mode 100644
index 0000000..849b72f
--- /dev/null
+++ b/examples/howto/fixed/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/fixed directory
+
+ADD_EXECUTABLE( fixed fixed.cc )
+
+TARGET_LINK_LIBRARIES( fixed xfc_ui )
diff --git a/examples/howto/fontselection/CMakeLists.txt b/examples/howto/fontselection/CMakeLists.txt
new file mode 100644
index 0000000..945229d
--- /dev/null
+++ b/examples/howto/fontselection/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/fontselection directory
+
+ADD_EXECUTABLE( fontselection fontselection.cc )
+
+TARGET_LINK_LIBRARIES( fontselection xfc_ui )
diff --git a/examples/howto/frame/CMakeLists.txt b/examples/howto/frame/CMakeLists.txt
new file mode 100644
index 0000000..9e72b6b
--- /dev/null
+++ b/examples/howto/frame/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/frame directory
+
+ADD_EXECUTABLE( frame frame.cc )
+
+TARGET_LINK_LIBRARIES( frame xfc_ui )
diff --git a/examples/howto/label/CMakeLists.txt b/examples/howto/label/CMakeLists.txt
new file mode 100644
index 0000000..ba463df
--- /dev/null
+++ b/examples/howto/label/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/label directory
+
+ADD_EXECUTABLE( label label.cc )
+
+TARGET_LINK_LIBRARIES( label xfc_ui )
diff --git a/examples/howto/menu/CMakeLists.txt b/examples/howto/menu/CMakeLists.txt
new file mode 100644
index 0000000..3e513a3
--- /dev/null
+++ b/examples/howto/menu/CMakeLists.txt
@@ -0,0 +1,9 @@
+## xfc examples/howto/menu directory
+
+ADD_EXECUTABLE( menu menu.cc )
+
+TARGET_LINK_LIBRARIES( menu xfc_ui )
+
+ADD_EXECUTABLE( stock stock.cc )
+
+TARGET_LINK_LIBRARIES( stock xfc_ui )
diff --git a/examples/howto/notebook/CMakeLists.txt b/examples/howto/notebook/CMakeLists.txt
new file mode 100644
index 0000000..a7a4d2a
--- /dev/null
+++ b/examples/howto/notebook/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/notebook directory
+
+ADD_EXECUTABLE( notebook notebook.cc )
+
+TARGET_LINK_LIBRARIES( notebook xfc_ui )
diff --git a/examples/howto/packbox/CMakeLists.txt b/examples/howto/packbox/CMakeLists.txt
new file mode 100644
index 0000000..b850460
--- /dev/null
+++ b/examples/howto/packbox/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/packbox directory
+
+ADD_EXECUTABLE( packbox packbox.cc )
+
+TARGET_LINK_LIBRARIES( packbox xfc_ui )
diff --git a/examples/howto/paned/CMakeLists.txt b/examples/howto/paned/CMakeLists.txt
new file mode 100644
index 0000000..329399e
--- /dev/null
+++ b/examples/howto/paned/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/paned directory
+
+ADD_EXECUTABLE( paned paned.cc )
+
+TARGET_LINK_LIBRARIES( paned xfc_ui )
diff --git a/examples/howto/progressbar/CMakeLists.txt b/examples/howto/progressbar/CMakeLists.txt
new file mode 100644
index 0000000..5d3c644
--- /dev/null
+++ b/examples/howto/progressbar/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/progressbar directory
+
+ADD_EXECUTABLE( progressbar progressbar.cc )
+
+TARGET_LINK_LIBRARIES( progressbar xfc_ui )
diff --git a/examples/howto/radiobuttons/CMakeLists.txt b/examples/howto/radiobuttons/CMakeLists.txt
new file mode 100644
index 0000000..a91ceab
--- /dev/null
+++ b/examples/howto/radiobuttons/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/radiobuttons directory
+
+ADD_EXECUTABLE( radiobuttons radiobuttons.cc )
+
+TARGET_LINK_LIBRARIES( radiobuttons xfc_ui )
diff --git a/examples/howto/rangewidgets/CMakeLists.txt b/examples/howto/rangewidgets/CMakeLists.txt
new file mode 100644
index 0000000..20d19a2
--- /dev/null
+++ b/examples/howto/rangewidgets/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/rangewidgets directory
+
+ADD_EXECUTABLE( rangewidgets rangewidgets.cc )
+
+TARGET_LINK_LIBRARIES( rangewidgets xfc_ui )
diff --git a/examples/howto/rulers/CMakeLists.txt b/examples/howto/rulers/CMakeLists.txt
new file mode 100644
index 0000000..2bcc368
--- /dev/null
+++ b/examples/howto/rulers/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/rulers directory
+
+ADD_EXECUTABLE( rulers rulers.cc )
+
+TARGET_LINK_LIBRARIES( rulers xfc_ui )
diff --git a/examples/howto/scrolledwindow/CMakeLists.txt b/examples/howto/scrolledwindow/CMakeLists.txt
new file mode 100644
index 0000000..6f3e69a
--- /dev/null
+++ b/examples/howto/scrolledwindow/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/scrolledwindow directory
+
+ADD_EXECUTABLE( scrolledwindow scrolledwindow.cc )
+
+TARGET_LINK_LIBRARIES( scrolledwindow xfc_ui )
diff --git a/examples/howto/selection/CMakeLists.txt b/examples/howto/selection/CMakeLists.txt
new file mode 100644
index 0000000..d6d1cd4
--- /dev/null
+++ b/examples/howto/selection/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/selection directory
+
+ADD_EXECUTABLE( selection selection.cc )
+
+TARGET_LINK_LIBRARIES( selection xfc_ui )
diff --git a/examples/howto/spinbutton/CMakeLists.txt b/examples/howto/spinbutton/CMakeLists.txt
new file mode 100644
index 0000000..e1c534c
--- /dev/null
+++ b/examples/howto/spinbutton/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/spinbutton directory
+
+ADD_EXECUTABLE( spinbutton spinbutton.cc )
+
+TARGET_LINK_LIBRARIES( spinbutton xfc_ui )
diff --git a/examples/howto/statusbar/CMakeLists.txt b/examples/howto/statusbar/CMakeLists.txt
new file mode 100644
index 0000000..beb418d
--- /dev/null
+++ b/examples/howto/statusbar/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/statusbar directory
+
+ADD_EXECUTABLE( statusbar statusbar.cc )
+
+TARGET_LINK_LIBRARIES( statusbar xfc_ui )
diff --git a/examples/howto/table/CMakeLists.txt b/examples/howto/table/CMakeLists.txt
new file mode 100644
index 0000000..60a1524
--- /dev/null
+++ b/examples/howto/table/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/table directory
+
+ADD_EXECUTABLE( table table.cc )
+
+TARGET_LINK_LIBRARIES( table xfc_ui )
diff --git a/examples/howto/textview/CMakeLists.txt b/examples/howto/textview/CMakeLists.txt
new file mode 100644
index 0000000..f6a1bbc
--- /dev/null
+++ b/examples/howto/textview/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/textview directory
+
+ADD_EXECUTABLE( textview textview.cc )
+
+TARGET_LINK_LIBRARIES( textview xfc_ui )
diff --git a/examples/howto/thread/CMakeLists.txt b/examples/howto/thread/CMakeLists.txt
new file mode 100644
index 0000000..4a0af50
--- /dev/null
+++ b/examples/howto/thread/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/thread directory
+
+ADD_EXECUTABLE( thread thread.cc )
+
+TARGET_LINK_LIBRARIES( thread xfc_ui )
diff --git a/examples/howto/tictactoe/CMakeLists.txt b/examples/howto/tictactoe/CMakeLists.txt
new file mode 100644
index 0000000..f75881d
--- /dev/null
+++ b/examples/howto/tictactoe/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/tictactoe directory
+
+ADD_EXECUTABLE( ttt_test tictactoe.cc ttt_test.cc)
+
+TARGET_LINK_LIBRARIES( ttt_test xfc_ui )
diff --git a/examples/howto/toolbar/CMakeLists.txt b/examples/howto/toolbar/CMakeLists.txt
new file mode 100644
index 0000000..fd258a1
--- /dev/null
+++ b/examples/howto/toolbar/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/toolbar directory
+
+ADD_EXECUTABLE( toolbar toolbar.cc )
+
+TARGET_LINK_LIBRARIES( toolbar xfc_ui )
diff --git a/examples/howto/treeview/CMakeLists.txt b/examples/howto/treeview/CMakeLists.txt
new file mode 100644
index 0000000..2261892
--- /dev/null
+++ b/examples/howto/treeview/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/howto/treeview directory
+
+ADD_EXECUTABLE( treeview treeview.cc )
+
+TARGET_LINK_LIBRARIES( treeview xfc_ui )
diff --git a/examples/ui/CMakeLists.txt b/examples/ui/CMakeLists.txt
new file mode 100644
index 0000000..ecad29b
--- /dev/null
+++ b/examples/ui/CMakeLists.txt
@@ -0,0 +1,10 @@
+## xfc examples/ui directory
+
+ADD_SUBDIRECTORY( actions )
+ADD_SUBDIRECTORY( cairo )
+ADD_SUBDIRECTORY( combobox )
+ADD_SUBDIRECTORY( entrycompletion )
+ADD_SUBDIRECTORY( filechooser )
+ADD_SUBDIRECTORY( mergemenus )
+ADD_SUBDIRECTORY( toolbar )
+ADD_SUBDIRECTORY( printing )
diff --git a/examples/ui/actions/CMakeLists.txt b/examples/ui/actions/CMakeLists.txt
new file mode 100644
index 0000000..f3a4059
--- /dev/null
+++ b/examples/ui/actions/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/ui/action directory
+
+ADD_EXECUTABLE( uactions actions.cc )
+
+TARGET_LINK_LIBRARIES( uactions xfc_ui )
diff --git a/examples/ui/cairo/CMakeLists.txt b/examples/ui/cairo/CMakeLists.txt
new file mode 100644
index 0000000..5a140e3
--- /dev/null
+++ b/examples/ui/cairo/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/ui/cairo directory
+
+ADD_EXECUTABLE( cairo cairo.cc ) 
+
+TARGET_LINK_LIBRARIES( cairo xfc_ui )
diff --git a/examples/ui/combobox/CMakeLists.txt b/examples/ui/combobox/CMakeLists.txt
new file mode 100644
index 0000000..4e4ee3f
--- /dev/null
+++ b/examples/ui/combobox/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/ui/combobox directory
+
+ADD_EXECUTABLE( ucombobox combobox.cc )
+
+TARGET_LINK_LIBRARIES( ucombobox xfc_ui )
diff --git a/examples/ui/entrycompletion/CMakeLists.txt b/examples/ui/entrycompletion/CMakeLists.txt
new file mode 100644
index 0000000..65be6a6
--- /dev/null
+++ b/examples/ui/entrycompletion/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/ui/entrycompletion directory
+
+ADD_EXECUTABLE( uentrycompletion entrycompletion.cc )
+
+TARGET_LINK_LIBRARIES( uentrycompletion xfc_ui )
diff --git a/examples/ui/filechooser/CMakeLists.txt b/examples/ui/filechooser/CMakeLists.txt
new file mode 100644
index 0000000..9b1bada
--- /dev/null
+++ b/examples/ui/filechooser/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/ui/filechooser directory
+
+ADD_EXECUTABLE( filechooser filechooser.cc )
+
+TARGET_LINK_LIBRARIES( filechooser xfc_ui )
diff --git a/examples/ui/mergemenus/CMakeLists.txt b/examples/ui/mergemenus/CMakeLists.txt
new file mode 100644
index 0000000..18347e2
--- /dev/null
+++ b/examples/ui/mergemenus/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/ui/mergemenus directory
+
+ADD_EXECUTABLE( mergemenus mergemenus.cc )
+
+TARGET_LINK_LIBRARIES( mergemenus xfc_ui )
diff --git a/examples/ui/printing/CMakeLists.txt b/examples/ui/printing/CMakeLists.txt
new file mode 100644
index 0000000..68ec48e
--- /dev/null
+++ b/examples/ui/printing/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/ui/printing directory
+
+ADD_EXECUTABLE( printing printing.cc )
+
+TARGET_LINK_LIBRARIES( printing xfc_ui )
diff --git a/examples/ui/toolbar/CMakeLists.txt b/examples/ui/toolbar/CMakeLists.txt
new file mode 100644
index 0000000..a9a5332
--- /dev/null
+++ b/examples/ui/toolbar/CMakeLists.txt
@@ -0,0 +1,5 @@
+## xfc examples/ui/toolbar directory
+
+ADD_EXECUTABLE( utoolbar toolbar.cc )
+
+TARGET_LINK_LIBRARIES( utoolbar xfc_ui )
diff --git a/ui/xfc/CMakeLists.txt b/ui/xfc/CMakeLists.txt
index 1ec74aa..5790027 100644
--- a/ui/xfc/CMakeLists.txt
+++ b/ui/xfc/CMakeLists.txt
@@ -15,6 +15,10 @@ ADD_SUBDIRECTORY( gdk-pixbuf )
 ADD_SUBDIRECTORY( gtk )
 ADD_SUBDIRECTORY( pango )
 
-ADD_LIBRARY( xfc_ui SHARED main.cc)
+SET( src ${atk_src} ${cairo_src} ${gdk_src} ${gdk_pixbuf_src} ${gtk_src} ${pango_src} )
 
-TARGET_LINK_LIBRARIES( xfc_ui xfc_atk xfc_cairo xfc_gdk xfc_gdk-pixbuf xfc_gtk xfc_pango ${GTK_LIBRARIES} )
+ADD_LIBRARY( xfc_ui SHARED main.cc ${src})
+
+TARGET_LINK_LIBRARIES( xfc_ui xfc_core ${GTK_LIBRARIES} )
+
+#SET_TARGET_PROPERTIES( xfc_ui PROPERTIES LINK_INTERFACE_LIBRARIES "")
diff --git a/ui/xfc/atk/CMakeLists.txt b/ui/xfc/atk/CMakeLists.txt
index 688425e..7504b86 100755
--- a/ui/xfc/atk/CMakeLists.txt
+++ b/ui/xfc/atk/CMakeLists.txt
@@ -1,6 +1,4 @@
-ADD_DEFINITIONS( -fPIC )
-
-ADD_LIBRARY( xfc_atk STATIC
+SET( src
  action.cc
  component.cc
  document.cc
@@ -28,3 +26,10 @@ ADD_LIBRARY( xfc_atk STATIC
  textsignals.cc 
  util.cc
  value.cc)
+
+SET(atk_src "" )
+FOREACH(f ${src})
+    SET(atk_src ${atk_src} "atk/${f}" )
+ENDFOREACH(f)
+SET( atk_src ${atk_src} PARENT_SCOPE )
+
diff --git a/ui/xfc/cairo/CMakeLists.txt b/ui/xfc/cairo/CMakeLists.txt
index 62f0cef..917cbcc 100644
--- a/ui/xfc/cairo/CMakeLists.txt
+++ b/ui/xfc/cairo/CMakeLists.txt
@@ -1,5 +1,10 @@
-ADD_DEFINITIONS( -fPIC )
-
-ADD_LIBRARY( xfc_cairo STATIC 
+SET( src
  context.cc matrix.cc ps_surface.cc xlib_surface.cc fontoptions.cc 
  pattern.cc surface.cc image_surface.cc pdf_surface.cc svg_surface.cc)
+
+SET(cairo_src "" )
+FOREACH(f ${src})
+    SET(cairo_src ${cairo_src} "cairo/${f}" )
+ENDFOREACH(f)
+SET( cairo_src ${cairo_src} PARENT_SCOPE )
+
diff --git a/ui/xfc/gdk-pixbuf/CMakeLists.txt b/ui/xfc/gdk-pixbuf/CMakeLists.txt
index b399751..ac4ee9a 100644
--- a/ui/xfc/gdk-pixbuf/CMakeLists.txt
+++ b/ui/xfc/gdk-pixbuf/CMakeLists.txt
@@ -1,7 +1,12 @@
-ADD_DEFINITIONS( -fPIC )
-
-ADD_LIBRARY( xfc_gdk-pixbuf STATIC 
+set( src
  pixbuf.cc pixbuf-io.cc 
  pixbuf-animation.cc 
  pixbuf-loader.cc 
  pixbuf-loadersignals.cc )
+
+SET(gdk_pixbuf_src "" )
+FOREACH(f ${src})
+    SET(gdk_pixbuf_src ${gdk_pixbuf_src} "gdk-pixbuf/${f}" )
+ENDFOREACH(f)
+SET( gdk_pixbuf_src ${gdk_pixbuf_src} PARENT_SCOPE )
+
diff --git a/ui/xfc/gdk/CMakeLists.txt b/ui/xfc/gdk/CMakeLists.txt
index 50d200b..af892a4 100644
--- a/ui/xfc/gdk/CMakeLists.txt
+++ b/ui/xfc/gdk/CMakeLists.txt
@@ -1,7 +1,12 @@
-ADD_DEFINITIONS( -fPIC )
-
-ADD_LIBRARY( xfc_gdk STATIC 
+SET( src 
  bitmap.cc color.cc cursor.cc display.cc displaysignals.cc displaymanager.cc 
  displaymanagersignals.cc dnd.cc drawable.cc events.cc gc.cc image.cc input.cc 
  keymap.cc keymapsignals.cc keyval.cc marshal.cc pangorenderer.cc pixmap.cc 
  region.cc screen.cc screensignals.cc spawn.cc types.cc visual.cc window.cc )
+
+SET(gdk_src "" )
+FOREACH(f ${src})
+    SET(gdk_src ${gdk_src} "gdk/${f}" )
+ENDFOREACH(f)
+SET( gdk_src ${gdk_src} PARENT_SCOPE )
+
diff --git a/ui/xfc/gtk/CMakeLists.txt b/ui/xfc/gtk/CMakeLists.txt
index 88763d4..09bde3f 100755
--- a/ui/xfc/gtk/CMakeLists.txt
+++ b/ui/xfc/gtk/CMakeLists.txt
@@ -1,6 +1,4 @@
-ADD_DEFINITIONS( -fPIC )
-
-ADD_LIBRARY( xfc_gtk STATIC
+SET( src
  aboutdialog.cc 
  accelgroup.cc accelgroupsignals.cc 
  accelkey.cc 
@@ -141,3 +139,9 @@ ADD_LIBRARY( xfc_gtk STATIC
  viewport.cc viewportsignals.cc 
  widget.cc widgetsignals.cc 
  window.cc windowsignals.cc)
+
+SET(gtk_src "" )
+FOREACH(f ${src})
+    SET(gtk_src ${gtk_src} "gtk/${f}" )
+ENDFOREACH(f)
+SET( gtk_src ${gtk_src} PARENT_SCOPE )
diff --git a/ui/xfc/pango/CMakeLists.txt b/ui/xfc/pango/CMakeLists.txt
index 469ac94..cc3bc9a 100644
--- a/ui/xfc/pango/CMakeLists.txt
+++ b/ui/xfc/pango/CMakeLists.txt
@@ -1,6 +1,4 @@
-ADD_DEFINITIONS( -fPIC )
-
-ADD_LIBRARY( xfc_pango STATIC
+set( src
  attributes.cc 
  break.cc
  context.cc 
@@ -15,3 +13,10 @@ ADD_LIBRARY( xfc_pango STATIC
  script.cc 
  tabs.cc 
  types.cc)
+
+SET( pango_src "" )
+FOREACH(f ${src})
+    SET(pango_src ${pango_src} "pango/${f}" )
+ENDFOREACH(f)
+SET( pango_src ${pango_src} PARENT_SCOPE )
+


More information about the Xfce4-commits mailing list