cairo-desklet

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

  1. cmake
  2. Merge into trunk
Proposed by Matthieu Baerts
Status: Merged
Merged at revision: 4
Proposed branch: lp:~matttbe/cairo-desklet/cmake
Merge into: lp:~fabounet03/cairo-desklet/trunk
Diff against target: 222 lines (+56/-72)
8 files modified
.bzrignore (+2/-0)
CMakeLists.txt (+28/-17)
cmake_uninstall.cmake.in (+21/-0)
data/CMakeLists.txt (+2/-2)
src/cairo-desklet-gui-simple.c (+1/-1)
src/cairo-desklet-menu.c (+1/-1)
src/cairo-desklet.c (+1/-1)
src/cmake_install.cmake (+0/-50)
To merge this branch: bzr merge lp:~matttbe/cairo-desklet/cmake
Reviewer Review Type Date Requested Status
Fabounet Pending
Review via email: mp+27979@code.launchpad.net
To post a comment you must log in.
lp:~matttbe/cairo-desklet/cmake updated
4. By Fabounet

merged with Matttbe's branch for better CMakeLists

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2010-06-19 00:23:27 +0000
@@ -0,0 +1,2 @@
1build/
2config.h
03
=== 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 @@
10########### project ###############10########### project ###############
1111
12project ("cairo-desklet")12project ("cairo-desklet")
13set (VERSION "2.2.0-0beta0")13set (VERSION "2.2.0-0beta1")
14set (CPACK_SOURCE_GENERATOR "TGZ")
15set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
16set (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}")
17include (CPack) # a inclure apres les set.
18add_custom_target(dist
19 COMMAND bzr export ${CMAKE_PROJECT_NAME}-${VERSION}.tar.gz
20 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
21#add_custom_target( dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) # pour pouvoir l'appeler avec "make dist"
22add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall 14add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall
23if (NOT ${CMAKE_BUILD_TYPE})15if (NOT ${CMAKE_BUILD_TYPE})
24 add_definitions (-O3)16 add_definitions (-O3)
25endif()17endif()
26add_custom_target(uninstall "${CMAKE_COMMAND}" -P "cmake_uninstall.cmake")18add_custom_target (uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
2719
20############ sources tarball ############
21
22set (CPACK_SOURCE_GENERATOR "TGZ")
23set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
24set (CPACK_SOURCE_IGNORE_FILES
25 "/build/;/.bzr/;bzrignore$;/config.h$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}")
26include (CPack)
27
28add_custom_target( dist
29 COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
30add_custom_target(dist-bzr
31 COMMAND bzr export ${CMAKE_PROJECT_NAME}-${VERSION}.tar.gz
32 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
2833
29########### global variables ###############34########### global variables ###############
3035
@@ -33,9 +38,15 @@
33set (prefix ${CMAKE_INSTALL_PREFIX})38set (prefix ${CMAKE_INSTALL_PREFIX})
34set (exec_prefix ${prefix})39set (exec_prefix ${prefix})
35set (datadir ${prefix}/share)40set (datadir ${prefix}/share)
36set (pkgdatadir ${datadir}/cairo-dock)41set (pkgdatadir ${datadir}/cairo-desklet)
37set (mandir ${datadir}/man)42set (mandir ${datadir}/man)
38set (libdir ${prefix}/lib)43
44if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
45 set (libdir ${prefix}/lib64)
46else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
47 set (libdir ${prefix}/lib)
48endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
49
39set (includedir ${prefix}/include)50set (includedir ${prefix}/include)
40set (bindir ${prefix}/bin)51set (bindir ${prefix}/bin)
4152
@@ -57,13 +68,13 @@
5768
58set (CAIRO_DESKLET_SHARE_DATA_DIR ${pkgdatadir})69set (CAIRO_DESKLET_SHARE_DATA_DIR ${pkgdatadir})
59set (CAIRO_DESKLET_LOGO "cairo-dock-logo.png")70set (CAIRO_DESKLET_LOGO "cairo-dock-logo.png")
60set (CAIRO_DESKLET_ICON "cairo-dock.svg")71set (CAIRO_DESKLET_ICON "cairo-desklet.svg")
61set (CAIRO_DESKLET_LOCALE_DIR ${datadir}/locale)72set (CAIRO_DESKLET_LOCALE_DIR ${datadir}/locale)
62set (CAIRO_DESKLET_GETTEXT_PACKAGE ${GETTEXT_PACKAGE})73set (CAIRO_DESKLET_GETTEXT_PACKAGE ${GETTEXT_PACKAGE})
63set (CAIRO_DESKLET_DATA_DIR "cairo-desklet")74set (CAIRO_DESKLET_DATA_DIR "cairo-desklet")
6475
65########### file generation ###############76########### file generation ###############
6677
67configure_file (config.h.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)78configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h)
68configure_file (data/cairo-desklet.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/data/cairo-desklet.conf)79configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/cairo-desklet.conf.in ${CMAKE_CURRENT_BINARY_DIR}/data/cairo-desklet.conf)
69#configure_file ("cmake_uninstall.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)80configure_file (${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake IMMEDIATE @ONLY)
7081
=== 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 @@
1IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
2 MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
3ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
4
5FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
6STRING(REGEX REPLACE "\n" ";" files "${files}")
7FOREACH(file ${files})
8 MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
9 IF(EXISTS "$ENV{DESTDIR}${file}")
10 EXEC_PROGRAM(
11 "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
12 OUTPUT_VARIABLE rm_out
13 RETURN_VALUE rm_retval
14 )
15 IF(NOT "${rm_retval}" STREQUAL 0)
16 MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
17 ENDIF(NOT "${rm_retval}" STREQUAL 0)
18 ELSE(EXISTS "$ENV{DESTDIR}${file}")
19 MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
20 ENDIF(EXISTS "$ENV{DESTDIR}${file}")
21ENDFOREACH(file)
022
=== 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 @@
5 rotate-desklet.svg 5 rotate-desklet.svg
6 no-input-desklet.png depth-rotate-desklet.svg6 no-input-desklet.png depth-rotate-desklet.svg
7 cairo-dock-ok.svg cairo-dock-cancel.svg7 cairo-dock-ok.svg cairo-dock-cancel.svg
8 cairo-dock-logo.png cairo-dock.svg8 cairo-dock-logo.png cairo-desklet.svg
9 cairo-desklet.conf9 cairo-desklet.conf
10 DESTINATION ${pkgdatadir})10 DESTINATION ${pkgdatadir})
1111
12install (FILES12install (FILES
13 cairo-dock.svg13 cairo-desklet.svg
14 DESTINATION ${datadir}/pixmaps)14 DESTINATION ${datadir}/pixmaps)
1515
=== 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 @@
24#include <glib/gstdio.h>24#include <glib/gstdio.h>
25#include <glib/gi18n.h>25#include <glib/gi18n.h>
2626
27#include "../config.h"27#include "config.h"
28#include <cairo-dock.h>28#include <cairo-dock.h>
29#include "cairo-desklet-gui-simple.h"29#include "cairo-desklet-gui-simple.h"
3030
3131
=== 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 @@
29#include <glib/gstdio.h>29#include <glib/gstdio.h>
30#include <gdk/gdkx.h>30#include <gdk/gdkx.h>
3131
32#include "../config.h"32#include "config.h"
33#include <cairo-dock.h>33#include <cairo-dock.h>
34#include "cairo-desklet-menu.h"34#include "cairo-desklet-menu.h"
3535
3636
=== 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 @@
1212
13#include <gtk/gtkgl.h>13#include <gtk/gtkgl.h>
1414
15#include "../config.h"15#include "config.h"
16#include <cairo-dock.h>16#include <cairo-dock.h>
17#include "cairo-desklet-menu.h"17#include "cairo-desklet-menu.h"
18#include "cairo-desklet-user-interaction.h"18#include "cairo-desklet-user-interaction.h"
1919
=== 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 @@
1# Install script for directory: /home/fab/CD2/cairo-desklet/src
2
3# Set the install prefix
4IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
5 SET(CMAKE_INSTALL_PREFIX "/usr")
6ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
7STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
8
9# Set the install configuration name.
10IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
11 IF(BUILD_TYPE)
12 STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
13 CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
14 ELSE(BUILD_TYPE)
15 SET(CMAKE_INSTALL_CONFIG_NAME "Debug")
16 ENDIF(BUILD_TYPE)
17 MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
18ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
19
20# Set the component getting installed.
21IF(NOT CMAKE_INSTALL_COMPONENT)
22 IF(COMPONENT)
23 MESSAGE(STATUS "Install component: \"${COMPONENT}\"")
24 SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
25 ELSE(COMPONENT)
26 SET(CMAKE_INSTALL_COMPONENT)
27 ENDIF(COMPONENT)
28ENDIF(NOT CMAKE_INSTALL_COMPONENT)
29
30# Install shared libraries without execute permission?
31IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
32 SET(CMAKE_INSTALL_SO_NO_EXE "1")
33ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
34
35IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
36 IF(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet" AND
37 NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet")
38 FILE(RPATH_CHECK
39 FILE "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet"
40 RPATH "")
41 ENDIF()
42 FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE EXECUTABLE FILES "/home/fab/CD2/cairo-desklet/src/cairo-desklet")
43 IF(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet" AND
44 NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet")
45 IF(CMAKE_INSTALL_DO_STRIP)
46 EXECUTE_PROCESS(COMMAND "/usr/bin/strip" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cairo-desklet")
47 ENDIF(CMAKE_INSTALL_DO_STRIP)
48 ENDIF()
49ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
50

Subscribers

People subscribed via source and target branches

to all changes: