Merge lp:~matttbe/cairo-desklet/cmake into lp:~fabounet03/cairo-desklet/trunk

[Matthieu Baerts]

[lp:~matttbe/cairo-desklet/cmake]

4. By Fabounet on 2010-06-19

merged with Matttbe's branch for better CMakeLists

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-06-19 00:23:27 +0000
@@ -0,0 +1,2 @@
+build/
+config.h

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2010-06-09 22:09:16 +0000
+++ CMakeLists.txt	2010-06-19 00:23:27 +0000
@@ -10,21 +10,26 @@
 ########### project ###############
 
 project ("cairo-desklet")
-set (VERSION "2.2.0-0beta0")
-set (CPACK_SOURCE_GENERATOR "TGZ")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
-set (CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;/.deps/;Makefile$;Makefile.in;.gmo$;/.libs/;.lo$;.la$;POTFILES;stamp-it;aclocal.m4;config.guess$;/config.h$;/config.h.in$;/config.log$;/config.status$;/config.sub$;/configure$;/depcomp$;/install-sh$;/libtool$;/ltmain.sh$;/missing$;/stamp-h1$;/compile;/CMakeFiles/;/_CPack_Packages/;/autom4te.cache/;/install_manifest.txt$;.tar.gz$;/CMakeCache.txt$;/cairo-dock$;/scripts/;/doc/;/data/themes.conf$;/data/cairo-dock.conf$;/data/main-dock.conf$;/data/cairo-dock-simple.conf$;/cairo-dock.pc$;.cmake$;~$;${CPACK_SOURCE_IGNORE_FILES}")
-include (CPack)  # a inclure apres les set.
-add_custom_target(dist
-    COMMAND bzr export ${CMAKE_PROJECT_NAME}-${VERSION}.tar.gz
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-#add_custom_target( dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)  # pour pouvoir l'appeler avec "make dist"
+set (VERSION "2.2.0-0beta1")
 add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall 
 if (NOT ${CMAKE_BUILD_TYPE})
 	add_definitions (-O3)
 endif()
-add_custom_target(uninstall "${CMAKE_COMMAND}" -P "cmake_uninstall.cmake")
-
+add_custom_target (uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
+############ sources tarball ############
+
+set (CPACK_SOURCE_GENERATOR "TGZ")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
+set (CPACK_SOURCE_IGNORE_FILES 
+	"/build/;/.bzr/;bzrignore$;/config.h$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}")
+include (CPack)
+
+add_custom_target( dist
+	COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+add_custom_target(dist-bzr
+	COMMAND bzr export ${CMAKE_PROJECT_NAME}-${VERSION}.tar.gz
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
 ########### global variables ###############
 
@@ -33,9 +38,15 @@
 set (prefix ${CMAKE_INSTALL_PREFIX})
 set (exec_prefix ${prefix})
 set (datadir ${prefix}/share)
-set (pkgdatadir ${datadir}/cairo-dock)
+set (pkgdatadir ${datadir}/cairo-desklet)
 set (mandir ${datadir}/man)
-set (libdir ${prefix}/lib)
+
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+	set (libdir ${prefix}/lib64)
+else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+	set (libdir ${prefix}/lib)
+endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+
 set (includedir ${prefix}/include)
 set (bindir ${prefix}/bin)
 
@@ -57,13 +68,13 @@
 
 set (CAIRO_DESKLET_SHARE_DATA_DIR ${pkgdatadir})
 set (CAIRO_DESKLET_LOGO "cairo-dock-logo.png")
-set (CAIRO_DESKLET_ICON "cairo-dock.svg")
+set (CAIRO_DESKLET_ICON "cairo-desklet.svg")
 set (CAIRO_DESKLET_LOCALE_DIR ${datadir}/locale)
 set (CAIRO_DESKLET_GETTEXT_PACKAGE ${GETTEXT_PACKAGE})
 set (CAIRO_DESKLET_DATA_DIR "cairo-desklet")
 
 ########### file generation ###############
 
-configure_file (config.h.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
-configure_file (data/cairo-desklet.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/data/cairo-desklet.conf)
-#configure_file ("cmake_uninstall.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/cairo-desklet.conf.in ${CMAKE_CURRENT_BINARY_DIR}/data/cairo-desklet.conf)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake IMMEDIATE @ONLY)

=== added file 'cmake_uninstall.cmake.in'
--- cmake_uninstall.cmake.in	1970-01-01 00:00:00 +0000
+++ cmake_uninstall.cmake.in	2010-06-19 00:23:27 +0000
@@ -0,0 +1,21 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+  IF(EXISTS "$ENV{DESTDIR}${file}")
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    IF(NOT "${rm_retval}" STREQUAL 0)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+    ENDIF(NOT "${rm_retval}" STREQUAL 0)
+  ELSE(EXISTS "$ENV{DESTDIR}${file}")
+    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2010-06-09 22:09:16 +0000
+++ data/CMakeLists.txt	2010-06-19 00:23:27 +0000
@@ -5,10 +5,10 @@
 	rotate-desklet.svg 
 	no-input-desklet.png 	depth-rotate-desklet.svg
 	cairo-dock-ok.svg 	cairo-dock-cancel.svg
-	cairo-dock-logo.png 	cairo-dock.svg
+	cairo-dock-logo.png 	cairo-desklet.svg
 	cairo-desklet.conf
 	DESTINATION ${pkgdatadir})
 
 install (FILES
-	cairo-dock.svg
+	cairo-desklet.svg
 	DESTINATION ${datadir}/pixmaps)

=== renamed file 'data/cairo-dock.svg' => 'data/cairo-desklet.svg'
=== modified file 'src/cairo-desklet-gui-simple.c'
--- src/cairo-desklet-gui-simple.c	2010-06-18 21:28:02 +0000
+++ src/cairo-desklet-gui-simple.c	2010-06-19 00:23:27 +0000
@@ -24,7 +24,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 
-#include "../config.h"
+#include "config.h"
 #include <cairo-dock.h>
 #include "cairo-desklet-gui-simple.h"
 

=== modified file 'src/cairo-desklet-menu.c'
--- src/cairo-desklet-menu.c	2010-06-09 22:09:16 +0000
+++ src/cairo-desklet-menu.c	2010-06-19 00:23:27 +0000
@@ -29,7 +29,7 @@
 #include <glib/gstdio.h>
 #include <gdk/gdkx.h>
 
-#include "../config.h"
+#include "config.h"
 #include <cairo-dock.h>
 #include "cairo-desklet-menu.h"
 

=== modified file 'src/cairo-desklet.c'
--- src/cairo-desklet.c	2010-06-18 21:28:02 +0000
+++ src/cairo-desklet.c	2010-06-19 00:23:27 +0000
@@ -12,7 +12,7 @@
 
 #include <gtk/gtkgl.h>
 
-#include "../config.h"
+#include "config.h"
 #include <cairo-dock.h>
 #include "cairo-desklet-menu.h"
 #include "cairo-desklet-user-interaction.h"

=== removed file 'src/cmake_install.cmake'
--- src/cmake_install.cmake	2010-06-09 22:09:16 +0000
+++ src/cmake_install.cmake	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-# Install script for directory: /home/fab/CD2/cairo-desklet/src
-
-# Set the install prefix
-IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  SET(CMAKE_INSTALL_PREFIX "/usr")
-ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
-STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-# Set the install configuration name.
-IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-  IF(BUILD_TYPE)
-    STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
-           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
-  ELSE(BUILD_TYPE)
-    SET(CMAKE_INSTALL_CONFIG_NAME "Debug")
-  ENDIF(BUILD_TYPE)
-  MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
-ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-
-# Set the component getting installed.
-IF(NOT CMAKE_INSTALL_COMPONENT)
-  IF(COMPONENT)
-    MESSAGE(STATUS "Install component: \"${COMPONENT}\"")
-    SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
-  ELSE(COMPONENT)
-    SET(CMAKE_INSTALL_COMPONENT)
-  ENDIF(COMPONENT)
-ENDIF(NOT CMAKE_INSTALL_COMPONENT)
-
-# Install shared libraries without execute permission?
-IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-  SET(CMAKE_INSTALL_SO_NO_EXE "1")
-ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-
-IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
-  IF(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet" AND
-     NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet")
-    FILE(RPATH_CHECK
-         FILE "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet"
-         RPATH "")
-  ENDIF()
-  FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE EXECUTABLE FILES "/home/fab/CD2/cairo-desklet/src/cairo-desklet")
-  IF(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet" AND
-     NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet")
-    IF(CMAKE_INSTALL_DO_STRIP)
-      EXECUTE_PROCESS(COMMAND "/usr/bin/strip" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet")
-    ENDIF(CMAKE_INSTALL_DO_STRIP)
-  ENDIF()
-ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
-