Files

Merge lp:~mefrio-g/pantheon-files/plugin-fix into lp:~elementary-apps/pantheon-files/trunk

  1. plugin-fix
  2. Merge into trunk
Proposed by Mario Guerriero
Status: Merged
Merged at revision: 834
Proposed branch: lp:~mefrio-g/pantheon-files/plugin-fix
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 39 lines (+8/-8)
3 files modified
plugins/extended-actions/CMakeLists.txt (+2/-2)
plugins/marlin-ctags/CMakeLists.txt (+3/-3)
plugins/marlin-trash/CMakeLists.txt (+3/-3)
To merge this branch: bzr merge lp:~mefrio-g/pantheon-files/plugin-fix
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+107925@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/extended-actions/CMakeLists.txt'
--- plugins/extended-actions/CMakeLists.txt 2011-12-04 12:05:59 +0000
+++ plugins/extended-actions/CMakeLists.txt 2012-05-30 07:57:18 +0000
@@ -24,5 +24,5 @@
24add_library(marlin-extended-actions SHARED24add_library(marlin-extended-actions SHARED
25 ${VALA_C})25 ${VALA_C})
26target_link_libraries(marlin-extended-actions marlincore marlinwidgets)26target_link_libraries(marlin-extended-actions marlincore marlinwidgets)
27install(TARGETS marlin-extended-actions DESTINATION lib/marlin/plugins/core/)27install(TARGETS marlin-extended-actions DESTINATION lib/pantheon-files/plugins/core/)
28install(FILES extended-actions.plug DESTINATION lib/marlin/plugins/core/)28install(FILES extended-actions.plug DESTINATION lib/pantheon-files/plugins/core/)
2929
=== modified file 'plugins/marlin-ctags/CMakeLists.txt'
--- plugins/marlin-ctags/CMakeLists.txt 2012-01-02 15:55:50 +0000
+++ plugins/marlin-ctags/CMakeLists.txt 2012-05-30 07:57:18 +0000
@@ -35,6 +35,6 @@
35add_library(marlinctags SHARED 35add_library(marlinctags SHARED
36 ${VALA_C})36 ${VALA_C})
37target_link_libraries(marlinctags ${DEPS_LIBRARIES} marlincore)37target_link_libraries(marlinctags ${DEPS_LIBRARIES} marlincore)
38install(TARGETS marlinctags DESTINATION lib/marlin/plugins/core/)38install(TARGETS marlinctags DESTINATION lib/pantheon-files/plugins/core/)
39install(FILES marlinctags.plug DESTINATION lib/marlin/plugins/core/)39install(FILES marlinctags.plug DESTINATION lib/pantheon-files/plugins/core/)
40include_directories(${CMAKE_BINARY_DIR}/marlinplugins/)40include_directories(${CMAKE_BINARY_DIR}/plugins/)
4141
=== modified file 'plugins/marlin-trash/CMakeLists.txt'
--- plugins/marlin-trash/CMakeLists.txt 2011-11-18 05:40:30 +0000
+++ plugins/marlin-trash/CMakeLists.txt 2012-05-30 07:57:18 +0000
@@ -33,6 +33,6 @@
33add_library(marlintrash SHARED 33add_library(marlintrash SHARED
34 ${VALA_C})34 ${VALA_C})
35target_link_libraries(marlintrash ${DEPS_LIBRARIES} marlincore)35target_link_libraries(marlintrash ${DEPS_LIBRARIES} marlincore)
36install(TARGETS marlintrash DESTINATION lib/marlin/plugins/core/)36install(TARGETS marlintrash DESTINATION lib/pantheon-files/plugins/core/)
37install(FILES marlintrash.plug DESTINATION lib/marlin/plugins/core/)37install(FILES marlintrash.plug DESTINATION lib/pantheon-files/plugins/core/)
38include_directories(${CMAKE_BINARY_DIR}/marlinplugins/)38include_directories(${CMAKE_BINARY_DIR}/plugins/)

Subscribers

People subscribed via source and target branches

to all changes: