[Xfce4-commits] <xfce4-mm:master> Changed to CMake build system.
Jens Luedicke
noreply at xfce.org
Sun Jan 16 20:02:02 CET 2011
Updating branch refs/heads/master
to 2baad3fa699a5c15a2824a85d3d8f1d5195c1cf6 (commit)
from d28ca935a8ac1bf0d832699b5d0f05fa4eb4f81e (commit)
commit 2baad3fa699a5c15a2824a85d3d8f1d5195c1cf6
Author: Jens Luedicke <jens at linux-vq8x.site>
Date: Sun Jan 16 19:50:33 2011 +0100
Changed to CMake build system.
CMakeLists.txt | 16 +++
Makefile.am | 13 ---
autogen.sh | 53 -----------
configure.ac.in | 200 ----------------------------------------
libxfce4util-mm/CMakeLists.txt | 21 ++++
libxfce4util-mm/Makefile.am | 48 ----------
6 files changed, 37 insertions(+), 314 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..480f1a2
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 2.6)
+project(xfce4-mm)
+
+include(FindPkgConfig)
+
+pkg_check_modules(GLIB2MM glibmm-2.4)
+pkg_check_modules(GTK2MM gtkmm-2.4)
+pkg_check_modules(LIBXFCE4UTIL libxfce4util-1.0)
+
+include_directories(${GLIB2MM_INCLUDE_DIRS})
+include_directories(${GTK2MM_INCLUDE_DIRS})
+include_directories(${LIBXFCE4UTIL_INCLUDE_DIRS})
+
+set(CMAKE_CXX_FLAGS "-g -Wall")
+add_subdirectory(libxfce4util-mm)
+
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index e8abea3..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS = \
- libxfce4util-mm \
- libxfce4gui-mm \
- tests
-
-EXTRA_DIST = \
- AUTHORS \
- COPYING \
- COPYING.LIB \
- ChangeLog \
- INSTALL \
- NEWS \
- README
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 170897e..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# $Id: autogen.sh 23241 2006-09-29 19:05:15Z kelnos $
-#
-# Copyright (c) 2002-2005
-# The Xfce development team. All rights reserved.
-#
-# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
-#
-
-(type xdt-autogen) >/dev/null 2>&1 || {
- cat >&2 <<EOF
-autogen.sh: You don't seem to have the Xfce development tools installed on
- your system, which are required to build this software.
- Please install the xfce4-dev-tools package first, available from
- http://xfce.org/~benny/projects/xfce4-dev-tools/.
-EOF
- exit 1
-}
-
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
- cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
- or try to checkout again.
-EOF
- exit 1
-}
-
-echo 'dnl *** This file is automatically generated from configure.ac.in ***' \
- >configure.ac
-echo 'dnl *** DO NOT EDIT! ***' >>configure.ac
-echo >>configure.ac
-
-# substitute revision and linguas
-linguas=$(sed -e '/^#/d' po/LINGUAS)
-if [ -d .git/svn ]; then
- revision=$(git svn find-rev trunk 2>/dev/null ||
- git svn find-rev origin/trunk 2>/dev/null ||
- git svn find-rev HEAD 2>/dev/null ||
- git svn find-rev master 2>/dev/null)
-elif [ -d .svn ]; then
- revision=$(LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}')
-else
- revision=UNKNOWN
-fi
-sed -e "s/@LINGUAS@/${linguas}/g" \
- -e "s/@REVISION@/${revision}/g" \
- < "configure.ac.in" >> "configure.ac"
-
-xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac.in b/configure.ac.in
deleted file mode 100644
index b51bd05..0000000
--- a/configure.ac.in
+++ /dev/null
@@ -1,200 +0,0 @@
-dnl configure.ac
-dnl
-dnl xfce4-mm - C++ wrapper library for Xfce 4
-dnl
-dnl Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
-dnl
-
-dnl version info
-m4_define([xfce4_mm_version_major], [0])
-m4_define([xfce4_mm_version_minor], [0])
-m4_define([xfce4_mm_version_micro], [1])
-m4_define([xfce4_mm_version_build], [r at REVISION@])
-
-m4_define([xfce4_mm_version], [xfce4_mm_version_major().xfce4_mm_version_minor().xfce4_mm_version_micro().xfce4_mm_version_build()])
-
-m4_define([libxfce4util_mm_verinfo], [0:0:0])
-m4_define([libxfce4util_mm_version_api], [1])
-m4_define([libxfce4util_mm_version_major], [0])
-m4_define([libxfce4util_mm_version_minor], [0])
-m4_define([libxfce4util_mm_version_micro], [1])
-m4_define([libxfce4util_mm_version_nano], [1])
-m4_define([libxfce4util_mm_version_build], [r at REVISION@])
-m4_define([libxfce4util_mm_version_tag], [])
-m4_define([libxfce4util_mm_version], [libxfce4util_mm_version_major().libxfce4util_mm_version_minor().libxfce4util_mm_version_micro()ifelse(libxfce4util_mm_version_nano(), [], [], [.libxfce4util_mm_version_nano()])ifelse(libxfce4util_mm_version_tag(), [svn], [libxfce4util_mm_version_tag()-libxfce4util_mm_version_build()], [libxfce4util_mm_version_tag()])])
-
-m4_define([libxfce4gui_mm_verinfo], [0:0:0])
-m4_define([libxfce4gui_mm_version_api], [1])
-m4_define([libxfce4gui_mm_version_major], [0])
-m4_define([libxfce4gui_mm_version_minor], [0])
-m4_define([libxfce4gui_mm_version_micro], [1])
-m4_define([libxfce4gui_mm_version_nano], [1])
-m4_define([libxfce4gui_mm_version_build], [r at REVISION@])
-m4_define([libxfce4gui_mm_version_tag], [])
-m4_define([libxfce4gui_mm_version], [libxfce4gui_mm_version_major().libxfce4gui_mm_version_minor().libxfce4gui_mm_version_micro()ifelse(libxfce4gui_mm_version_nano(), [], [], [.libxfce4gui_mm_version_nano()])ifelse(libxfce4gui_mm_version_tag(), [svn], [libxfce4gui_mm_version_tag()-libxfce4gui_mm_version_build()], [libxfce4gui_mm_version_tag()])])
-
-dnl init autoconf
-AC_INIT([libxfce4-mm], [xfce4_mm_version], [http://bugzilla.xfce.org/])
-AC_PREREQ([2.50])
-
-AC_LANG([C++])
-
-dnl init automake
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
-AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
-
-dnl **************************
-dnl *** Libtool versioning ***
-dnl **************************
-LIBXFCE4UTIL_MM_VERINFO=libxfce4util_mm_verinfo()
-AC_SUBST([LIBXFCE4UTIL_MM_VERINFO])
-
-LIBXFCE4GUI_MM_VERINFO=libxfce4gui_mm_verinfo()
-AC_SUBST([LIBXFCE4GUI_MM_VERINFO])
-
-dnl ****************************
-dnl *** Subst libxfce4util-mm version ***
-dnl ****************************
-LIBXFCE4UTIL_MM_VERSION_API=libxfce4util_mm_version_api()
-LIBXFCE4UTIL_MM_VERSION_MAJOR=libxfce4util_mm_version_major()
-LIBXFCE4UTIL_MM_VERSION_MINOR=libxfce4util_mm_version_minor()
-LIBXFCE4UTIL_MM_VERSION_MICRO=libxfce4util_mm_version_micro()
-AC_SUBST([LIBXFCE4UTIL_MM_VERSION_API])
-AC_SUBST([LIBXFCE4UTIL_MM_VERSION_MAJOR])
-AC_SUBST([LIBXFCE4UTIL_MM_VERSION_MINOR])
-AC_SUBST([LIBXFCE4UTIL_MM_VERSION_MICRO])
-
-dnl ****************************
-dnl *** Subst libxfce4gui-mm version ***
-dnl ****************************
-LIBXFCE4GUI_MM_VERSION_API=libxfce4gui_mm_version_api()
-LIBXFCE4GUI_MM_VERSION_MAJOR=libxfce4gui_mm_version_major()
-LIBXFCE4GUI_MM_VERSION_MINOR=libxfce4gui_mm_version_minor()
-LIBXFCE4GUI_MM_VERSION_MICRO=libxfce4gui_mm_version_micro()
-AC_SUBST([LIBXFCE4GUI_MM_VERSION_API])
-AC_SUBST([LIBXFCE4GUI_MM_VERSION_MAJOR])
-AC_SUBST([LIBXFCE4GUI_MM_VERSION_MINOR])
-AC_SUBST([LIBXFCE4GUI_MM_VERSION_MICRO])
-
-dnl check for UNIX variants
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
-
-dnl check for basic programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-AC_PROG_LN_S
-
-dnl check for standard header files
-AC_HEADER_STDC
-AC_CHECK_HEADERS([errno.h fcntl.h grp.h \
- signal.h stdlib.h string.h \
- sys/stat.h sys/time.h sys/types.h sys/wait.h \
- unistd.h string vector algorithm])
-dnl AC_CHECK_FUNCS([fdwalk getdtablesize setsid sysconf])
-
-dnl Check for i18n support
-dnl XDT_I18N([@LINGUAS@])
-
-dnl Check for X11 installed
-dnl XDT_CHECK_LIBX11_REQUIRE
-
-dnl required
-XDT_CHECK_PACKAGE([GLIBMM], [glibmm-2.4], [2.18.1])
-XDT_CHECK_PACKAGE([GTKMM], [gtkmm-2.4], [2.14.3])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.5.99.1])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.5.99.1])
-
-dnl check for debugging support
-AC_ARG_ENABLE([debug],
-AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@],
- [Turn on debugging @<:@default=xfce4_mm_default@:>@]),
- [], [enable_debug=xfce4_mm_default])
-AC_MSG_CHECKING([whether to enable debugging support])
-if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
- dnl Print the result
- AC_MSG_RESULT([$enable_debug])
-
- dnl Define debug for libxfce4util DBG macro
- AC_DEFINE([DEBUG], [1], [Define for debugging support])
-
- dnl Make sure we detect possible errors (if supported)
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wall -Werror"
- AC_MSG_CHECKING([whether $CXX accepts -Wall -Werror])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
- AC_MSG_RESULT([yes])
- PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS -Wall -Werror"
- ], [
- AC_MSG_RESULT([no])
- ])
- CXXFLAGS="$save_CXXFLAGS"
-
- dnl Paranoia for --enable-debug=full
- if test x"$enable_debug" = x"full"; then
- dnl Enable extensive debugging
- PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS -DG_ENABLE_DEBUG"
-
- dnl Use -O0 -g3 if the compiler supports it
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -O0 -g3"
- AC_MSG_CHECKING([whether $CXX accepts -O0 -g3])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
- AC_MSG_RESULT([yes])
- PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS -O0 -g3"
- ], [
- AC_MSG_RESULT([no])
- ])
- CXXFLAGS="$save_CXXFLAGS"
- fi
-else
- dnl Print the result
- AC_MSG_RESULT([$enable_debug])
-
- dnl Disable debugging (release build)
- PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS -DNDEBUG"
-
- dnl Disable object cast checks
- PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS -DG_DISABLE_CAST_CHECKS"
-
- dnl Disable all checks for --enable-debug=no
- if test x"$enable_debug" = x"no"; then
- PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
- fi
-fi
-
-dnl *********************************
-dnl *** Substitute platform flags ***
-dnl *********************************
-AC_MSG_CHECKING([PLATFORM_CPPFLAGS])
-AC_MSG_RESULT([$PLATFORM_CPPFLAGS])
-AC_SUBST([PLATFORM_CPPFLAGS])
-
-AC_MSG_CHECKING([PLATFORM_CXXFLAGS])
-AC_MSG_RESULT([$PLATFORM_CXXFLAGS])
-AC_SUBST([PLATFORM_CXXFLAGS])
-
-AC_MSG_CHECKING([PLATFORM_CFLAGS])
-AC_MSG_RESULT([$PLATFORM_CFLAGS])
-AC_SUBST([PLATFORM_CFLAGS])
-
-AC_MSG_CHECKING([PLATFORM_LDFLAGS])
-AC_MSG_RESULT([$PLATFORM_LDFLAGS])
-AC_SUBST([PLATFORM_LDFLAGS])
-
-AC_OUTPUT([
-Makefile
-libxfce4util-mm/Makefile
-libxfce4util-mm/libxfce4util-mm-1.0.pc
-libxfce4gui-mm/Makefile
-libxfce4gui-mm/libxfce4gui-mm-1.0.pc
-tests/Makefile
-])
-
-echo "Compiler flags: "
-echo $PLATFORM_CXXFLAGS
diff --git a/libxfce4util-mm/CMakeLists.txt b/libxfce4util-mm/CMakeLists.txt
new file mode 100644
index 0000000..941c802
--- /dev/null
+++ b/libxfce4util-mm/CMakeLists.txt
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 2.6)
+project(libxfce4util-mm)
+
+set (libxfce4util-mm_VERSION_MAJOR 0)
+set (libxfce4util-mm_VERSION_MINOR 1)
+
+include_directories(${xfce4-mm_SOURCE_DIR}/libxfce4util-mm)
+
+add_library(xfce4util-mm SHARED file-utils.cpp kiosk.cpp misc-utils.cpp rc.cpp resource.cpp utf8-utils.cpp)
+
+target_link_libraries(xfce4util-mm ${GLIB2MM_LDFLAGS} ${GTK2MM_LDFLAGS} ${LIBXFCE4UTIL_LDFLAGS})
+
+install (TARGETS xfce4util-mm DESTINATION lib)
+
+install (FILES "${libxfce4util-mm_SOURCE_DIR}/file-utils.h" DESTINATION "include/libxfce4util-mm")
+install (FILES "${libxfce4util-mm_SOURCE_DIR}/kiosk.h" DESTINATION "include/libxfce4util-mm")
+install (FILES "${libxfce4util-mm_SOURCE_DIR}/misc-utils.h" DESTINATION "include/libxfce4util-mm")
+install (FILES "${libxfce4util-mm_SOURCE_DIR}/rc.h" DESTINATION "include/libxfce4util-mm")
+install (FILES "${libxfce4util-mm_SOURCE_DIR}/resource-enum.h" DESTINATION "include/libxfce4util-mm")
+install (FILES "${libxfce4util-mm_SOURCE_DIR}/resource.h" DESTINATION "include/libxfce4util-mm")
+install (FILES "${libxfce4util-mm_SOURCE_DIR}/utf8-utils.h" DESTINATION "include/libxfce4util-mm")
diff --git a/libxfce4util-mm/Makefile.am b/libxfce4util-mm/Makefile.am
deleted file mode 100644
index dfa8554..0000000
--- a/libxfce4util-mm/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-
-INCLUDES = \
- -I$(top_srcdir) \
- -DG_LOG_DOMAIN=\"libxfce4util-mm\" \
- $(PLATFORM_CXXFLAGS)
-
-lib_LTLIBRARIES = \
- libxfce4util-mm.la
-
-libxfce4util_mm_includedir = $(includedir)/xfce4/libxfce4util-mm
-libxfce4util_mm_include_HEADERS = \
- kiosk.h \
- rc.h \
- resource.h \
- file-utils.h \
- misc-utils.h \
- utf8-utils.h
-
-libxfce4util_mm_la_SOURCES = \
- kiosk.cpp \
- kiosk.h \
- rc.cpp \
- rc.h \
- resource.cpp \
- resource.h \
- file-utils.cpp \
- file-utils.h \
- misc-utils.cpp \
- misc-utils.h \
- utf8-utils.cpp \
- utf8-utils.h
-
-libxfce4util_mm_la_CXXFLAGS = \
- $(GLIBMM_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(PLATFORM_CXXFLAGS)
-
-libxfce4util_mm_la_LDFLAGS =
- -version-info $(LIBXFCE4UTIL_MM_VERINFO) \
- $(PLATFORM_LDFLAGS)
-
-libxfce4util_mm_la_LIBADD = \
- $(GLIBMM_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(PLATFORM_LIBS)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libxfce4util-mm-1.0.pc
More information about the Xfce4-commits
mailing list