Skip to content

Commit fe26e1f

Browse files
author
Corentin Noël
committed
Fixed some warnings and useless inclusions.
1 parent 0c29448 commit fe26e1f

19 files changed

Lines changed: 50 additions & 105 deletions

File tree

‎plugins/CMakeLists.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
set (DEFAULT_PLUGIN_OPTIONS
2+
--thread
3+
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
4+
--vapidir=${CMAKE_BINARY_DIR}/src/
5+
--target-glib=2.32
6+
)
7+
18
add_subdirectory (contractor)
29
add_subdirectory (pastebin)
310
add_subdirectory (filemanager)

‎plugins/brackets-completion/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@ PACKAGES
1414
libpeas-1.0
1515
${ZEITGEIST_DEPS}
1616
OPTIONS
17-
--thread
18-
--vapidir=${CMAKE_BINARY_DIR}
19-
--vapidir=${CMAKE_BINARY_DIR}/src/
20-
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
21-
--vapidir=${CMAKE_BINARY_DIR}/scratchcore/
17+
${DEFAULT_PLUGIN_OPTIONS}
2218
)
2319

2420
add_library(${PLUGIN_NAME} MODULE ${VALA_C})
25-
add_dependencies(${PLUGIN_NAME} ${LIBNAME} scratch)
21+
add_dependencies(${PLUGIN_NAME} ${LIBNAME})
2622

2723
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
2824
install(FILES ${PLUGIN_NAME}.plugin DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})

‎plugins/browser-preview/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,11 @@ PACKAGES
2222
libpeas-1.0
2323
${ZEITGEIST_DEPS}
2424
OPTIONS
25-
--thread
26-
--vapidir=${CMAKE_BINARY_DIR}
27-
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
28-
--vapidir=${CMAKE_BINARY_DIR}/src/
29-
--vapidir=${CMAKE_BINARY_DIR}/scratchcore/
25+
${DEFAULT_PLUGIN_OPTIONS}
3026
)
3127

3228
add_library(${PLUGIN_NAME} MODULE ${VALA_C})
33-
add_dependencies(${PLUGIN_NAME} ${LIBNAME} scratch)
29+
add_dependencies(${PLUGIN_NAME} ${LIBNAME})
3430

3531
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
3632
install(FILES ${PLUGIN_NAME}.plugin DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})

‎plugins/clipboard-history/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@ PACKAGES
1414
libpeas-1.0
1515
${ZEITGEIST_DEPS}
1616
OPTIONS
17-
--thread
18-
--vapidir=${CMAKE_BINARY_DIR}
19-
--vapidir=${CMAKE_BINARY_DIR}/src/
20-
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
21-
--vapidir=${CMAKE_BINARY_DIR}/scratchcore/
17+
${DEFAULT_PLUGIN_OPTIONS}
2218
)
2319

2420
add_library(${PLUGIN_NAME} MODULE ${VALA_C})
25-
add_dependencies(${PLUGIN_NAME} ${LIBNAME} scratch)
21+
add_dependencies(${PLUGIN_NAME} ${LIBNAME})
2622

2723
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
2824
install(FILES ${PLUGIN_NAME}.plugin DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})

‎plugins/contractor/CMakeLists.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@ PACKAGES
1515
libpeas-1.0
1616
${ZEITGEIST_DEPS}
1717
OPTIONS
18-
--vapidir=${CMAKE_BINARY_DIR}
19-
--vapidir=${CMAKE_BINARY_DIR}/src/
20-
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
21-
--vapidir=${CMAKE_BINARY_DIR}/scratchcore/
18+
${DEFAULT_PLUGIN_OPTIONS}
2219
)
2320

2421
add_library(${PLUGIN_NAME} MODULE ${VALA_C})
25-
add_dependencies(${PLUGIN_NAME} ${LIBNAME} scratch)
22+
add_dependencies(${PLUGIN_NAME} ${LIBNAME})
2623

2724
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
2825
install(FILES ${PLUGIN_NAME}.plugin DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})

‎plugins/detect-indent/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@ PACKAGES
1414
libpeas-1.0
1515
${ZEITGEIST_DEPS}
1616
OPTIONS
17-
--thread
18-
--vapidir=${CMAKE_BINARY_DIR}
19-
--vapidir=${CMAKE_BINARY_DIR}/src/
20-
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
21-
--vapidir=${CMAKE_BINARY_DIR}/scratchcore/
17+
${DEFAULT_PLUGIN_OPTIONS}
2218
)
2319

2420
add_library(${PLUGIN_NAME} MODULE ${VALA_C})
25-
add_dependencies(${PLUGIN_NAME} ${LIBNAME} scratch)
21+
add_dependencies(${PLUGIN_NAME} ${LIBNAME})
2622

2723
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
2824
install(FILES ${PLUGIN_NAME}.plugin DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})

‎plugins/filemanager/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ PACKAGES
1717
gtksourceview-3.0
1818
${ZEITGEIST_DEPS}
1919
OPTIONS
20-
--vapidir=${CMAKE_BINARY_DIR}
21-
--vapidir=${CMAKE_BINARY_DIR}/src/
22-
--vapidir=${CMAKE_BINARY_DIR}/scratchcore/
20+
${DEFAULT_PLUGIN_OPTIONS}
2321
)
2422

2523
add_library(${PLUGIN_NAME} MODULE ${VALA_C})
26-
add_dependencies(${PLUGIN_NAME} ${LIBNAME} scratch)
24+
add_dependencies(${PLUGIN_NAME} ${LIBNAME})
2725

2826
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
2927
install(FILES ${PLUGIN_NAME}.plugin DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})

‎plugins/folder-manager/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ PACKAGES
1717
gtksourceview-3.0
1818
${ZEITGEIST_DEPS}
1919
OPTIONS
20-
--vapidir=${CMAKE_BINARY_DIR}
21-
--vapidir=${CMAKE_BINARY_DIR}/src/
22-
--vapidir=${CMAKE_BINARY_DIR}/scratchcore/
20+
${DEFAULT_PLUGIN_OPTIONS}
2321
)
2422

2523
add_library(${PLUGIN_NAME} MODULE ${VALA_C})
26-
add_dependencies(${PLUGIN_NAME} ${LIBNAME} scratch)
24+
add_dependencies(${PLUGIN_NAME} ${LIBNAME})
2725

2826
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
2927
install(FILES ${PLUGIN_NAME}.plugin DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})

‎plugins/highlight-word-selection/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@ PACKAGES
1414
libpeas-1.0
1515
${ZEITGEIST_DEPS}
1616
OPTIONS
17-
--thread
18-
--vapidir=${CMAKE_BINARY_DIR}
19-
--vapidir=${CMAKE_BINARY_DIR}/src/
20-
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
21-
--vapidir=${CMAKE_BINARY_DIR}/scratchcore/
17+
${DEFAULT_PLUGIN_OPTIONS}
2218
)
2319

2420
add_library(${PLUGIN_NAME} MODULE ${VALA_C})
25-
add_dependencies(${PLUGIN_NAME} ${LIBNAME} scratch)
21+
add_dependencies(${PLUGIN_NAME} ${LIBNAME})
2622

2723
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
2824
install(FILES ${PLUGIN_NAME}.plugin DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})

‎plugins/open-with/CMakeLists.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@ PACKAGES
1414
libpeas-1.0
1515
${ZEITGEIST_DEPS}
1616
OPTIONS
17-
--vapidir=${CMAKE_BINARY_DIR}
18-
--vapidir=${CMAKE_BINARY_DIR}/src/
19-
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
20-
--vapidir=${CMAKE_BINARY_DIR}/scratchcore/
17+
${DEFAULT_PLUGIN_OPTIONS}
2118
)
2219

2320
add_library(${PLUGIN_NAME} MODULE ${VALA_C})
24-
add_dependencies(${PLUGIN_NAME} ${LIBNAME} scratch)
21+
add_dependencies(${PLUGIN_NAME} ${LIBNAME})
2522

2623
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
2724
install(FILES ${PLUGIN_NAME}.plugin DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})

0 commit comments

Comments
 (0)