Commit fda9691e authored by David Bommes's avatar David Bommes

-allow Compiler Defines per plugin

-fixed string/list issue

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14497 383ad7c9-94d9-4d36-a494-682f7c89f535
parent a07de57f
......@@ -249,8 +249,16 @@ macro (_check_plugin_deps _prefix _optional )
list (APPEND ${_prefix}_DEPS_LIBRARIES "${${_name}_LIBRARY}")
endif ()
if (DEFINED ${_name}_LINKER_FLAGS)
list (APPEND ${_prefix}_DEPS_LINKER_FLAGS "${${_name}_LINKER_FLAGS}")
# list (APPEND ${_prefix}_DEPS_LINKER_FLAGS "${${_name}_LINKER_FLAGS}")
# this variable is used as a string later on (not as a list!!!)
set( ${_prefix}_DEPS_LINKER_FLAGS "${${_prefix}_DEPS_LINKER_FLAGS} ${${_name}_LINKER_FLAGS}")
endif ()
if (DEFINED ${_name}_COMPILER_FLAGS)
# list (APPEND ${_prefix}_DEPS_COMPILER_FLAGS "${${_name}_COMPILER_FLAGS}")
# this variable is used as a string later on (not as a list!!!)
set( ${_prefix}_DEPS_COMPILER_FLAGS "${${_prefix}_DEPS_COMPILER_FLAGS} ${${_name}_COMPILER_FLAGS}")
endif ()
endforeach ()
else ()
set (${_prefix}_HAS_DEPS FALSE)
......@@ -481,9 +489,10 @@ function (_build_openflipper_plugin plugin)
acg_set (OPENFLIPPER_${_PLUGIN}_BUILD "1")
# append compiler and linker flags from plugin dependencies
set_target_properties (
Plugin-${plugin} PROPERTIES
COMPILE_FLAGS "${${_PLUGIN}_CFLAGSADD} ${${_PLUGIN}_LICENSE_DEFS}"
COMPILE_FLAGS "${${_PLUGIN}_CFLAGSADD} ${${_PLUGIN}_LICENSE_DEFS} ${${_PLUGIN}_DEPS_COMPILER_FLAGS}"
LINK_FLAGS "${${_PLUGIN}_LDFLAGSADD} ${${_PLUGIN}_DEPS_LINKER_FLAGS}"
)
......
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