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: 6
Proposed branch: lp:~matttbe/cairo-desklet/cmake
Merge into: lp:~fabounet03/cairo-desklet/trunk
Diff against target: 37 lines (+10/-5)
2 files modified
CMakeLists.txt (+6/-4)
data/CMakeLists.txt (+4/-1)
To merge this branch: bzr merge lp:~matttbe/cairo-desklet/cmake
Reviewer Review Type Date Requested Status
Fabounet Pending
Review via email: mp+27993@code.launchpad.net

Description of the change

J'avais pourtant testé il me semble mais j'ai oublié d'ajouté "${CMAKE_CURRENT_BINARY_DIR}" pour installer le fichier .conf produit.

To post a comment you must log in.
lp:~matttbe/cairo-desklet/cmake updated
5. By Fabounet

removed actions on files

6. By Fabounet

merged CMakeLists.txt from Matttbe

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2010-06-19 00:20:36 +0000
3+++ CMakeLists.txt 2010-06-23 21:26:22 +0000
4@@ -41,11 +41,13 @@
5 set (pkgdatadir ${datadir}/cairo-desklet)
6 set (mandir ${datadir}/man)
7
8-if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
9+if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND "${LIB_SUFFIX}" STREQUAL "" AND "${FORCE_NOT_LIB64}" STREQUAL "" )
10 set (libdir ${prefix}/lib64)
11-else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
12- set (libdir ${prefix}/lib)
13-endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
14+elseif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_NOT_LIB64}" STREQUAL "" )
15+ set (libdir ${prefix}/lib${LIB_SUFFIX})
16+else()
17+ set (libdir ${prefix}/lib${LIB_SUFFIX})
18+endif()
19
20 set (includedir ${prefix}/include)
21 set (bindir ${prefix}/bin)
22
23=== modified file 'data/CMakeLists.txt'
24--- data/CMakeLists.txt 2010-06-19 00:20:36 +0000
25+++ data/CMakeLists.txt 2010-06-23 21:26:22 +0000
26@@ -6,7 +6,10 @@
27 no-input-desklet.png depth-rotate-desklet.svg
28 cairo-dock-ok.svg cairo-dock-cancel.svg
29 cairo-dock-logo.png cairo-desklet.svg
30- cairo-desklet.conf
31+ DESTINATION ${pkgdatadir})
32+
33+install (FILES
34+ ${CMAKE_CURRENT_BINARY_DIR}/cairo-desklet.conf
35 DESTINATION ${pkgdatadir})
36
37 install (FILES

Subscribers

People subscribed via source and target branches

to all changes: