diff options
| author | Dennis Kasprzyk <onestone@compiz-fusion.org> | 2009-03-16 16:52:37 +0100 |
|---|---|---|
| committer | Dennis kasprzyk <onestone@compiz-fusion.org> | 2009-03-16 16:52:37 +0100 |
| commit | 1817e5429eb79e289a2e2a7d7ac4e3c988f2c6c5 (patch) | |
| tree | d1c1fbb11c32a08e420aeb9930571f5f84b4e7f9 /gtk | |
| parent | 59666304be35773fcb4c9c7eeef40695e6203c8c (diff) | |
| download | zcomp-1817e5429eb79e289a2e2a7d7ac4e3c988f2c6c5.tar.gz zcomp-1817e5429eb79e289a2e2a7d7ac4e3c988f2c6c5.tar.bz2 | |
Added optional install, that will not abort installation if file can't be installed.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gnome/CMakeLists.txt | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/gtk/gnome/CMakeLists.txt b/gtk/gnome/CMakeLists.txt index c677a41..a8bec20 100644 --- a/gtk/gnome/CMakeLists.txt +++ b/gtk/gnome/CMakeLists.txt @@ -29,9 +29,9 @@ if (USE_GNOME) ${CMAKE_CURRENT_SOURCE_DIR}/compiz-wm.desktop.in ${wmproperties_file} ) - install ( - FILES ${wmproperties_file} - DESTINATION ${windowsettingsdatadir}/gnome/wm-properties + compiz_opt_install_file ( + ${wmproperties_file} + ${windowsettingsdatadir}/gnome/wm-properties/compiz-wm.desktop ) @@ -48,9 +48,13 @@ if (USE_GNOME) ${CMAKE_CURRENT_BINARY_DIR}/50-compiz-desktop-key.xml ${CMAKE_CURRENT_BINARY_DIR}/50-compiz-key.xml ) - install ( - FILES ${key_xml} - DESTINATION ${keybindingsdir} + compiz_opt_install_file ( + ${CMAKE_CURRENT_BINARY_DIR}/50-compiz-desktop-key.xml + ${keybindingsdir}/50-compiz-desktop-key.xml + ) + compiz_opt_install_file ( + ${CMAKE_CURRENT_BINARY_DIR}/50-compiz-key.xml + ${keybindingsdir}/50-compiz-key.xml ) endif (USE_GNOME_KEYBINDINGS) @@ -62,8 +66,10 @@ if (USE_GNOME) ${wmproperties_file} ) + set_target_properties (gnome-compiz PROPERTIES OUTPUT_NAME compiz + SKIP_BUILD_RPATH 1 ) target_link_libraries ( @@ -72,7 +78,11 @@ if (USE_GNOME) install ( TARGETS gnome-compiz - DESTINATION ${windowsettingslibdir}/window-manager-settings + DESTINATION ${CMAKE_CURRENT_BINARY_DIR} ) + compiz_opt_install_file ( + ${CMAKE_CURRENT_BINARY_DIR}/libcompiz.so + ${windowsettingslibdir}/window-manager-settings/libcompiz.so + ) endif (USE_GNOME) |