Commit fe5f6b76 authored by Jan Möbius's avatar Jan Möbius
Browse files

Dennis: 0008-Look-for-c-sources-and-additinal-source-parameter-AD.patch

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5875 383ad7c9-94d9-4d36-a494-682f7c89f535
parent a2c58be3
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
# [CFLAGSADD flag1 flag2 ...] # [CFLAGSADD flag1 flag2 ...]
# [LIBRARIES lib1 lib2 ...] # [LIBRARIES lib1 lib2 ...]
# [LIBDIRS dir1 dir2 ...] # [LIBDIRS dir1 dir2 ...]
# [INCDIRS dir1 dir2 ...]) # [INCDIRS dir1 dir2 ...]
# [ADDSRC file1 file2 ...])
# #
# DIRS = additional directories with source files # DIRS = additional directories with source files
# DEPS = required dependencies for find_package macro # DEPS = required dependencies for find_package macro
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
# LIBRARIES = libraries added to link command # LIBRARIES = libraries added to link command
# LIBDIRS = additional link directories # LIBDIRS = additional link directories
# INCDIRS = additional include directories # INCDIRS = additional include directories
# ADDSRC = additional source files
# #
# Plugins can implement a of_list_filter ("listname") macro to filter out # Plugins can implement a of_list_filter ("listname") macro to filter out
# unneeded headers, sources and ui files from the autogenerated # unneeded headers, sources and ui files from the autogenerated
...@@ -34,7 +36,7 @@ endmacro () ...@@ -34,7 +36,7 @@ endmacro ()
# parse plugin macro parameter # parse plugin macro parameter
macro (_get_plugin_parameters _prefix) macro (_get_plugin_parameters _prefix)
set (_current_var _foo) set (_current_var _foo)
set (_supported_var DIRS DEPS OPTDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS) set (_supported_var DIRS DEPS OPTDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS ADDSRC)
foreach (_val ${_supported_var}) foreach (_val ${_supported_var})
set (${_prefix}_${_val}) set (${_prefix}_${_val})
endforeach () endforeach ()
...@@ -136,6 +138,7 @@ function (_build_openflipper_plugin plugin) ...@@ -136,6 +138,7 @@ function (_build_openflipper_plugin plugin)
# collect all header,source and ui files # collect all header,source and ui files
append_files (headers "*.hh" ${directories}) append_files (headers "*.hh" ${directories})
append_files (sources "*.cc" ${directories}) append_files (sources "*.cc" ${directories})
append_files (sources "*.c" ${directories})
append_files (ui "*.ui" ${directories}) append_files (ui "*.ui" ${directories})
# remove template cc files from source file list # remove template cc files from source file list
...@@ -152,7 +155,7 @@ function (_build_openflipper_plugin plugin) ...@@ -152,7 +155,7 @@ function (_build_openflipper_plugin plugin)
qt4_autouic (uic_targets ${ui}) qt4_autouic (uic_targets ${ui})
qt4_automoc (moc_targets ${headers}) qt4_automoc (moc_targets ${headers})
add_library (Plugin-${plugin} MODULE ${uic_targets} ${sources} ${headers} ${moc_targets}) add_library (Plugin-${plugin} MODULE ${uic_targets} ${sources} ${headers} ${moc_targets} ${${_PLUGIN}_ADDSRC})
# add this plugin to build plugin list for dependency tracking # add this plugin to build plugin list for dependency tracking
of_set (OPENFLIPPER_PLUGINS "${OPENFLIPPER_PLUGINS};Plugin-${plugin}") of_set (OPENFLIPPER_PLUGINS "${OPENFLIPPER_PLUGINS};Plugin-${plugin}")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment