Updating branch refs/heads/master to 12592389476b45cfc6f3920bd626f014fa659abd (commit) from a46c90dd0214094538a3ec2aa19b369636d48628 (commit)
commit 12592389476b45cfc6f3920bd626f014fa659abd Author: Bo Lorensen <b...@lue.dk> Date: Wed Sep 7 20:52:11 2011 +0200 add new build system core/xfc/CMakeLists.txt | 58 ++++------- de/xfc/CMakeLists.txt | 8 ++- de/xfc/utils/CMakeLists.txt | 7 +- debian/changelog | 6 + debian/rules | 79 ++++++--------- examples/CMakeLists.txt | 2 +- ui/xfc/CMakeLists.txt | 12 +++ ui/xfc/atk/CMakeLists.txt | 31 ++++++ ui/xfc/atk/Makefile.am | 112 +++++++++++----------- ui/xfc/cairo/CMakeLists.txt | 13 +++ ui/xfc/cairo/Makefile.am | 46 +++++----- ui/xfc/gdk-pixbuf/CMakeLists.txt | 12 ++- ui/xfc/gdk/CMakeLists.txt | 30 ++++++ ui/xfc/gdk/Makefile.am | 108 ++++++++++---------- ui/xfc/gtk/CMakeLists.txt | 202 ++++++++++++++++++++++++++++++++++++++ ui/xfc/pango/CMakeLists.txt | 21 ++++- xfc-config.h.in | 2 +- 17 files changed, 524 insertions(+), 225 deletions(-) diff --git a/core/xfc/CMakeLists.txt b/core/xfc/CMakeLists.txt index 7f9c7df..0ac61a6 100644 --- a/core/xfc/CMakeLists.txt +++ b/core/xfc/CMakeLists.txt @@ -1,46 +1,30 @@ +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( ${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 ${glib_files}) + utfstring.cc version.cc ${glib_src}) TARGET_LINK_LIBRARIES( xfc_core ${GLIB_LIBRARIES} ${GOBJ_LIBRARIES} ${GMOD_LIBRARIES} ${GTHR_LIBRARIES} ${SIGC_LIBRARIES}) - +SET_TARGET_PROPERTIES( xfc_core PROPERTIES VERSION ${XFC_VERSION} SOVERSION ${XFC_MAJOR_VERSION} ) #SET_TARGET_PROPERTIES( xfc_core PROPERTIES LINK_INTERFACE_LIBRARIES "") + +INSTALL(TARGETS xfc_core + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib ) + +INSTALL( FILES + convert.hh + i18n.hh + integerobject.hh + object.hh + pointer.hh + stackobject.hh + trackable.hh + utfstring.hh + version.hh + xfccore.hh + DESTINATION include/xfc) diff --git a/de/xfc/CMakeLists.txt b/de/xfc/CMakeLists.txt index 06afe40..32319fc 100644 --- a/de/xfc/CMakeLists.txt +++ b/de/xfc/CMakeLists.txt @@ -5,10 +5,16 @@ pkg_search_module( XFCE_UI REQUIRED libxfce4ui-1 ) pkg_search_module( XFCE_CONF REQUIRED libxfconf-0 ) INCLUDE_DIRECTORIES( ${XFCE_UTILS_INCLUDE_DIRS} ${XFCE_CONF_INCLUDE_DIRS} ${XFCE_UI_INCLUDE_DIRS} ) +INCLUDE_DIRECTORIES( ${XFC_DE_SOURCE_DIR} ${XFC_CORE_SOURCE_DIR} ${SIGC_INCLUDE_DIRS} ${XFCE_CONF_INCLUDE_DIRS} ${XFCE_UTIL_INCLUDE_DIRS}) -ADD_LIBRARY( xfc_de SHARED main.cc) +ADD_LIBRARY( xfc_de SHARED main.cc ${utils_src}) TARGET_LINK_LIBRARIES( xfc_de ${XFCE_UTILS_LIBRARIES} ${XFCE_CONF_LIBRARIES} ${XFCE_UI_LIBARIES}) +SET_TARGET_PROPERTIES( xfc_de PROPERTIES VERSION ${XFC_VERSION} SOVERSION ${XFC_MAJOR_VERSION} ) + +INSTALL(TARGETS xfc_de + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib ) #ADD_SUBDIRECTORY( ui ) #ADD_SUBDIRECTORY( panel ) diff --git a/de/xfc/utils/CMakeLists.txt b/de/xfc/utils/CMakeLists.txt index 6645af1..ec5c27d 100644 --- a/de/xfc/utils/CMakeLists.txt +++ b/de/xfc/utils/CMakeLists.txt @@ -1,3 +1,6 @@ -INCLUDE_DIRECTORIES( ${XFC_DE_SOURCE_DIR} ${XFC_CORE_SOURCE_DIR} ${SIGC_INCLUDE_DIRS} ${XFCE_CONF_INCLUDE_DIRS} ${XFCE_UTIL_INCLUDE_DIRS}) -ADD_LIBRARY( xfc_de_utils STATIC config.cc ) +SET( utils_src + utils/config.cc ) + +INSTALL( FILES config.hh DESTINATION include/xfc/utils ) +INSTALL( FILES inline/config.inl DESTINATION include/xfc/utils/inline ) diff --git a/debian/changelog b/debian/changelog index d036867..d11751a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xfc (4.6.0-1) unstable; urgency=low + + * Convert the builing system to cmake + + -- Bo Lorentsen <b...@lue.dk> Mon, 15 Aug 2011 23:55:46 +0100 + xfc (4.3.4-1) unstable; urgency=low * New micro release diff --git a/debian/rules b/debian/rules index db463d6..4e7f1aa 100755 --- a/debian/rules +++ b/debian/rules @@ -9,39 +9,40 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +# This is the debhelper compatibility version to use. +export DH_COMPAT=5 -CFLAGS = -Wall +DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CMAKE_BUILD_TYPE=Debug else - CFLAGS += -O2 + CMAKE_BUILD_TYPE=Release endif -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` +#DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR) +DEB_CMAKE_PREFIX =/usr -configure: - ./autogen.sh +#DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -config.status: configure +common-configure-arch common-configure-indep:: common-configure-impl +common-configure-impl:: CMakeCache.txt +CMakeCache.txt: + cmake -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" -DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_BUILD_TYPE="$(CMAKE_BUILD_TYPE)" $(DEB_CMAKE_EXTRA_FLAGS) -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_VERBOSE_MAKEFILE=OFF $(CURDIR)/$(DEB_SRCDIR) + +cleanbuilddir:: + -rm CMakeCache.txt + +configure: configure-stamp +configure-stamp: CMakeCache.txt dh_testdir # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --enable-docs # LDFLAGS="-Wl,-z,defs" + #cmake . + touch configure-stamp build: build-stamp -build-stamp: config.status +build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. @@ -52,19 +53,14 @@ build-stamp: config.status clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - + -$(MAKE) clean + find . -name CMakeFiles -exec rm -rf {} \; + -rm CMakeCache.txt - dh_clean + dh_clean install: build dh_testdir @@ -75,7 +71,6 @@ install: build # Add here commands to install the package into debian/tmp $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -84,32 +79,20 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs ChangeLog + dh_installchangelogs dh_installdocs dh_installexamples dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman +# dh_pysupport dh_link dh_strip dh_compress dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs dh_installdeb -# dh_shlibdeps + dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index d96754b..c741e80 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -6,6 +6,6 @@ INCLUDE_DIRECTORIES( ${XFC_UI_SOURCE_DIR} ${XFC_CORE_SOURCE_DIR} ADD_SUBDIRECTORY( core ) ADD_SUBDIRECTORY( howto ) ADD_SUBDIRECTORY( ui ) -#ADD_SUBDIRECTORY( tutorial ) +ADD_SUBDIRECTORY( tutorial ) # @GLADE_EXAMPLESDIR@ @SOURCEVIEW_EXAMPLEDIR@ diff --git a/ui/xfc/CMakeLists.txt b/ui/xfc/CMakeLists.txt index 5790027..ef34434 100644 --- a/ui/xfc/CMakeLists.txt +++ b/ui/xfc/CMakeLists.txt @@ -20,5 +20,17 @@ SET( src ${atk_src} ${cairo_src} ${gdk_src} ${gdk_pixbuf_src} ${gtk_src} ${pango ADD_LIBRARY( xfc_ui SHARED main.cc ${src}) TARGET_LINK_LIBRARIES( xfc_ui xfc_core ${GTK_LIBRARIES} ) +SET_TARGET_PROPERTIES( xfc_ui PROPERTIES VERSION ${XFC_VERSION} SOVERSION ${XFC_MAJOR_VERSION} ) + +INSTALL(TARGETS xfc_ui + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib ) + +INSTALL( FILES + main.hh + ui.hh + xfcui.hh + config.h + DESTINATION include/xfc) #SET_TARGET_PROPERTIES( xfc_ui PROPERTIES LINK_INTERFACE_LIBRARIES "") diff --git a/ui/xfc/atk/CMakeLists.txt b/ui/xfc/atk/CMakeLists.txt index 7504b86..bbee347 100755 --- a/ui/xfc/atk/CMakeLists.txt +++ b/ui/xfc/atk/CMakeLists.txt @@ -1,3 +1,5 @@ +ADD_SUBDIRECTORY( inline ) + SET( src action.cc component.cc @@ -33,3 +35,32 @@ FOREACH(f ${src}) ENDFOREACH(f) SET( atk_src ${atk_src} PARENT_SCOPE ) +INSTALL( FILES + action.hh + atk.hh + component.hh + document.hh + editabletext.hh + gobjectaccessible.hh + hyperlink.hh + hyperlinksignals.hh + hypertext.hh + hypertextsignals.hh + image.hh + implementor.hh + object.hh + objectsignals.hh + objectfactory.hh + registry.hh + relation.hh + selection.hh + selectionsignals.hh + stateset.hh + streamablecontent.hh + table.hh + tablesignals.hh + text.hh + textsignals.hh + util.hh + value.hh + DESTINATION include/xfc/atk) diff --git a/ui/xfc/atk/Makefile.am b/ui/xfc/atk/Makefile.am index 58582af..50c461e 100755 --- a/ui/xfc/atk/Makefile.am +++ b/ui/xfc/atk/Makefile.am @@ -4,66 +4,66 @@ SUBDIRS = inline private AM_CXXFLAGS = @CXXFLAGS@ @XFC_CORE_CFLAGS@ @XFC_ATK_CFLAGS@ -INCLUDES = \ - -I$(top_builddir)/libXFCcore \ +INCLUDES = + -I$(top_builddir)/libXFCcore -I$(top_builddir)/libXFCui -hh_sources = \ - action.hh \ - atk.hh \ - component.hh \ - document.hh \ - editabletext.hh \ - gobjectaccessible.hh \ - hyperlink.hh \ - hyperlinksignals.hh \ - hypertext.hh \ - hypertextsignals.hh \ - image.hh \ - implementor.hh \ - object.hh \ - objectsignals.hh \ - objectfactory.hh \ - registry.hh \ - relation.hh \ - selection.hh \ - selectionsignals.hh \ - stateset.hh \ - streamablecontent.hh \ - table.hh \ - tablesignals.hh \ - text.hh \ - textsignals.hh \ - util.hh \ +hh_sources = + action.hh + atk.hh + component.hh + document.hh + editabletext.hh + gobjectaccessible.hh + hyperlink.hh + hyperlinksignals.hh + hypertext.hh + hypertextsignals.hh + image.hh + implementor.hh + object.hh + objectsignals.hh + objectfactory.hh + registry.hh + relation.hh + selection.hh + selectionsignals.hh + stateset.hh + streamablecontent.hh + table.hh + tablesignals.hh + text.hh + textsignals.hh + util.hh value.hh -cc_sources = \ - action.cc \ - component.cc \ - document.cc \ - editabletext.cc \ - gobjectaccessible.cc \ - hyperlink.cc \ - hyperlinksignals.cc \ - hypertext.cc \ - hypertextsignals.cc \ - image.cc \ - implementor.cc \ - marshal.cc \ - object.cc \ - objectsignals.cc \ - objectfactory.cc \ - registry.cc \ - relation.cc \ - selection.cc \ - selectionsignals.cc \ - stateset.cc \ - streamablecontent.cc \ - table.cc \ - tablesignals.cc \ - text.cc \ - textsignals.cc \ - util.cc \ +cc_sources = + action.cc + component.cc + document.cc + editabletext.cc + gobjectaccessible.cc + hyperlink.cc + hyperlinksignals.cc + hypertext.cc + hypertextsignals.cc + image.cc + implementor.cc + marshal.cc + object.cc + objectsignals.cc + objectfactory.cc + registry.cc + relation.cc + selection.cc + selectionsignals.cc + stateset.cc + streamablecontent.cc + table.cc + tablesignals.cc + text.cc + textsignals.cc + util.cc value.cc library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/atk diff --git a/ui/xfc/cairo/CMakeLists.txt b/ui/xfc/cairo/CMakeLists.txt index 917cbcc..cc03c2b 100644 --- a/ui/xfc/cairo/CMakeLists.txt +++ b/ui/xfc/cairo/CMakeLists.txt @@ -8,3 +8,16 @@ FOREACH(f ${src}) ENDFOREACH(f) SET( cairo_src ${cairo_src} PARENT_SCOPE ) +INSTALL( FILES + context.hh + matrix.hh + ps_surface.hh + types.hh + fontoptions.hh + pattern.hh + surface.hh + xlib_surface.hh + image_surface.hh + pdf_surface.hh + svg_surface.hh + DESTINATION include/xfc/cairo) diff --git a/ui/xfc/cairo/Makefile.am b/ui/xfc/cairo/Makefile.am index bf1cbc5..ff86380 100644 --- a/ui/xfc/cairo/Makefile.am +++ b/ui/xfc/cairo/Makefile.am @@ -4,33 +4,33 @@ AM_CXXFLAGS = @CXXFLAGS@ @XFC_CORE_CFLAGS@ @XFC_UI_CFLAGS@ -INCLUDES = \ - -I$(top_builddir)/libXFCcore \ +INCLUDES = + -I$(top_builddir)/libXFCcore -I$(top_builddir)/libXFCui -hh_sources = \ - context.hh \ - matrix.hh \ - ps_surface.hh \ - types.hh \ - fontoptions.hh \ - pattern.hh \ - surface.hh \ - xlib_surface.hh \ - image_surface.hh \ - pdf_surface.hh \ +hh_sources = + context.hh + matrix.hh + ps_surface.hh + types.hh + fontoptions.hh + pattern.hh + surface.hh + xlib_surface.hh + image_surface.hh + pdf_surface.hh svg_surface.hh -cc_sources = \ - context.cc \ - matrix.cc \ - ps_surface.cc \ - xlib_surface.cc \ - fontoptions.cc \ - pattern.cc \ - surface.cc \ - image_surface.cc \ - pdf_surface.cc \ +cc_sources = + 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 library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/cairo diff --git a/ui/xfc/gdk-pixbuf/CMakeLists.txt b/ui/xfc/gdk-pixbuf/CMakeLists.txt index ac4ee9a..8036d65 100644 --- a/ui/xfc/gdk-pixbuf/CMakeLists.txt +++ b/ui/xfc/gdk-pixbuf/CMakeLists.txt @@ -1,4 +1,6 @@ -set( src +ADD_SUBDIRECTORY( inline ) + +SET( src pixbuf.cc pixbuf-io.cc pixbuf-animation.cc pixbuf-loader.cc @@ -10,3 +12,11 @@ FOREACH(f ${src}) ENDFOREACH(f) SET( gdk_pixbuf_src ${gdk_pixbuf_src} PARENT_SCOPE ) +INSTALL( FILES + gdk-pixbuf.hh + pixbuf.hh + pixbuf-io.hh + pixbuf-animation.hh + pixbuf-loader.hh + pixbuf-loadersignals.hh + DESTINATION include/xfc/gdk-pixbuf ) diff --git a/ui/xfc/gdk/CMakeLists.txt b/ui/xfc/gdk/CMakeLists.txt index af892a4..3686788 100644 --- a/ui/xfc/gdk/CMakeLists.txt +++ b/ui/xfc/gdk/CMakeLists.txt @@ -1,3 +1,5 @@ +ADD_SUBDIRECTORY( inline ) + 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 @@ -10,3 +12,31 @@ FOREACH(f ${src}) ENDFOREACH(f) SET( gdk_src ${gdk_src} PARENT_SCOPE ) +INSTALL( FILES + bitmap.hh + color.hh + cursor.hh + display.hh + displaysignals.hh + displaymanager.hh + displaymanagersignals.hh + dnd.hh + drawable.hh + events.hh + gc.hh + gdk.hh + image.hh + input.hh + keymap.hh + keymapsignals.hh + keyval.hh + pangorenderer.hh + pixmap.hh + region.hh + screen.hh + screensignals.hh + spawn.hh + types.hh + visual.hh + window.hh + DESTINATION include/xfc/gdk) diff --git a/ui/xfc/gdk/Makefile.am b/ui/xfc/gdk/Makefile.am index b2e09a1..d9da7fd 100644 --- a/ui/xfc/gdk/Makefile.am +++ b/ui/xfc/gdk/Makefile.am @@ -4,64 +4,64 @@ SUBDIRS = inline private AM_CXXFLAGS = @CXXFLAGS@ @XFC_CORE_CFLAGS@ @XFC_GTK_CFLAGS@ -INCLUDES = \ - -I$(top_builddir)/libXFCcore \ +INCLUDES = + -I$(top_builddir)/libXFCcore -I$(top_builddir)/libXFCui -hh_sources = \ - bitmap.hh \ - color.hh \ - cursor.hh \ - display.hh \ - displaysignals.hh \ - displaymanager.hh \ - displaymanagersignals.hh \ - dnd.hh \ - drawable.hh \ - events.hh \ - gc.hh \ - gdk.hh \ - image.hh \ - input.hh \ - keymap.hh \ - keymapsignals.hh \ - keyval.hh \ - pangorenderer.hh \ - pixmap.hh \ - region.hh \ - screen.hh \ - screensignals.hh \ - spawn.hh \ - types.hh \ - visual.hh \ +hh_sources = + bitmap.hh + color.hh + cursor.hh + display.hh + displaysignals.hh + displaymanager.hh + displaymanagersignals.hh + dnd.hh + drawable.hh + events.hh + gc.hh + gdk.hh + image.hh + input.hh + keymap.hh + keymapsignals.hh + keyval.hh + pangorenderer.hh + pixmap.hh + region.hh + screen.hh + screensignals.hh + spawn.hh + types.hh + visual.hh window.hh -cc_sources = \ - 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 \ +cc_sources = + 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 library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/gdk diff --git a/ui/xfc/gtk/CMakeLists.txt b/ui/xfc/gtk/CMakeLists.txt index 09bde3f..8150a6f 100755 --- a/ui/xfc/gtk/CMakeLists.txt +++ b/ui/xfc/gtk/CMakeLists.txt @@ -1,3 +1,5 @@ +ADD_SUBDIRECTORY( inline ) + SET( src aboutdialog.cc accelgroup.cc accelgroupsignals.cc @@ -145,3 +147,203 @@ FOREACH(f ${src}) SET(gtk_src ${gtk_src} "gtk/${f}" ) ENDFOREACH(f) SET( gtk_src ${gtk_src} PARENT_SCOPE ) + +INSTALL( FILES + aboutdialog.hh + accelgroup.hh + accelgroupsignals.hh + accelkey.hh + accellabel.hh + accelmap.hh + accessible.hh + action.hh + actionsignals.hh + actiongroup.hh + adjustment.hh + adjustmentsignals.hh + alignment.hh + arrow.hh + aspectframe.hh + bin.hh + box.hh + boxchild.hh + builder.hh + button.hh + buttonsignals.hh + buttonbox.hh + calendar.hh + calendarsignals.hh + celleditable.hh + celleditablesignals.hh + celllayout.hh + cellrenderer.hh + cellrenderercombo.hh + cellrenderersignals.hh + cellrendererpixbuf.hh + cellrendererprogress.hh + cellrenderertext.hh + cellrenderertextsignals.hh + cellrenderertoggle.hh + cellrenderertogglesignals.hh + cellview.hh + checkbutton.hh + checkmenuitem.hh + checkmenuitemsignals.hh + clipboard.hh + colorbutton.hh + colorbuttonsignals.hh + colorselection.hh + colorselectionsignals.hh + combobox.hh + comboboxentry.hh + comboboxsignals.hh + container.hh + containersignals.hh + curve.hh + curvesignals.hh + dialog.hh + dialogsignals.hh + dnd.hh + drawingarea.hh + editable.hh + editablesignals.hh + entry.hh + entrycompletion.hh + entrycompletionsignals.hh + entrysignals.hh + enums.hh + eventbox.hh + expander.hh + filechooser.hh + filechooserbutton.hh + filechooserdialog.hh + filechooserwidget.hh + filefilter.hh + fixed.hh + fontbutton.hh + fontbuttonsignals.hh + fontselection.hh + frame.hh + gammacurve.hh + gc.hh + gtk.hh + handlebox.hh + handleboxsignals.hh + iconfactory.hh + iconset.hh + iconsource.hh + icontheme.hh + iconthemesignals.hh + iconview.hh + iconviewsignals.hh + image.hh + imagemenuitem.hh + invisible.hh + item.hh + itemsignals.hh + label.hh + labelsignals.hh + layout.hh + layoutsignals.hh + liststore.hh + menu.hh + menubar.hh + menuitem.hh + menuitemsignals.hh + menushell.hh + menushellsignals.hh + menutoolbutton.hh + messagedialog.hh + misc.hh + notebook.hh + notebooksignals.hh + object.hh + objectsignals.hh + paned.hh + plug.hh + plugsignals.hh + progressbar.hh + printer.hh + printcontext.hh + printdialogs.hh + printjob.hh + printoperationpreview.hh + printoperationpreviewsignals.hh + printoperation.hh + printoperationsignals.hh + printpagesetup.hh + printsetting.hh + radioaction.hh + radioactionsignals.hh + radiobutton.hh + radiobuttonsignals.hh + radiomenuitem.hh + radiomenuitemsignals.hh + radiotoolbutton.hh + range.hh + rangesignals.hh + rc.hh + ruler.hh + scale.hh + scalesignals.hh + scrollbar.hh + scrolledwindow.hh + selection.hh + separator.hh + separatormenuitem.hh + separatortoolitem.hh + settings.hh + sizegroup.hh + socket.hh + socketsignals.hh + spinbutton.hh + spinbuttonsignals.hh + statusbar.hh + statusbarsignals.hh + stock.hh + stockid.hh + style.hh + table.hh + tearoffmenuitem.hh + textbuffer.hh + textbuffersignals.hh + textiter.hh + texttag.hh + texttagsignals.hh + textview.hh + textviewsignals.hh + toggleaction.hh + toggleactionsignals.hh + togglebutton.hh + togglebuttonsignals.hh + toggletoolbutton.hh + toggletoolbuttonsignals.hh + toolbar.hh + toolbarsignals.hh + toolbutton.hh + toolbuttonsignals.hh + toolitem.hh + toolitemsignals.hh + tooltips.hh + treednd.hh + treemodel.hh + treemodelfilter.hh + treemodelsignals.hh + treemodelsort.hh + treeselection.hh + treesortable.hh + treesortablesignals.hh + treestore.hh + treeview.hh + treeviewsignals.hh + treeviewcolumn.hh + treeviewcolumnsignals.hh + uimanager.hh + uimanagersignals.hh + viewport.hh + viewportsignals.hh + widget.hh + widgetsignals.hh + window.hh + windowsignals.hh + DESTINATION include/xfc/gtk) diff --git a/ui/xfc/pango/CMakeLists.txt b/ui/xfc/pango/CMakeLists.txt index cc3bc9a..c5333d3 100644 --- a/ui/xfc/pango/CMakeLists.txt +++ b/ui/xfc/pango/CMakeLists.txt @@ -1,4 +1,6 @@ -set( src +ADD_SUBDIRECTORY( inline ) + +SET( src attributes.cc break.cc context.cc @@ -20,3 +22,20 @@ FOREACH(f ${src}) ENDFOREACH(f) SET( pango_src ${pango_src} PARENT_SCOPE ) +INSTALL( FILES + attributes.hh + break.hh + context.hh + coverage.hh + font.hh + fontmap.hh + fontset.hh + glyph.hh + item.hh + layout.hh + pango.hh + renderer.hh + script.hh + tabs.hh + types.hh + DESTINATION include/xfc/pango) diff --git a/xfc-config.h.in b/xfc-config.h.in index 8460e7c..cd409fd 100644 --- a/xfc-config.h.in +++ b/xfc-config.h.in @@ -63,7 +63,7 @@ #cmakedefine PACKAGE_URL /* Define to the version of this package. */ -#cmakedefine PACKAGE_VERSION +#define PACKAGE_VERSION "${XFC_VERSION}" /* Define to 1 if you have the ANSI C header files. */ #cmakedefine STDC_HEADERS _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits