Skip to content
Snippets Groups Projects
Commit 6779736b authored by Dominic Kempf's avatar Dominic Kempf
Browse files

Introduce an APPEND parameter on the dune_register_package_flags macro

By default, the new falgs are prepended to the list of flags. This way,
the most general libraries (whihc are usually checked first) appear at
the end of the list. Adding the APPEND option to the call allows to
explicitly append them at the end.
parent 173af823
No related branches found
No related tags found
No related merge requests found
......@@ -58,7 +58,7 @@ endmacro(dune_enable_all_packages)
function(dune_register_package_flags)
include(CMakeParseArguments)
set(OPTIONS PREPEND)
set(OPTIONS APPEND)
set(SINGLEARGS)
set(MULTIARGS COMPILE_DEFINITIONS INCLUDE_DIRS LIBRARIES)
cmake_parse_arguments(REGISTRY "${OPTIONS}" "${SINGLEARGS}" "${MULTIARGS}" ${ARGN})
......@@ -67,16 +67,16 @@ function(dune_register_package_flags)
message(WARNING "Unrecognized arguments for dune_register_package_flags!")
endif()
if(REG_PREPEND)
get_property(GLOBAL PROPERTY ALL_PKG_INCS all_incs)
get_property(GLOBAL PROPERTY ALL_PKG_LIBS all_libs)
get_property(GLOBAL PROPERTY ALL_PKG_DEFS all_defs)
set_property(GLOBAL PROPERTY ALL_PKG_INCS "${REGISTRY_INCLUDE_DIRS}" "${all_incs}")
set_property(GLOBAL PROPERTY ALL_PKG_LIBS "${REGISTRY_LIBRARIES}" "${all_libs}")
set_property(GLOBAL PROPERTY ALL_PKG_DEFS "${REGISTRY_COMPILE_DEFINITIONS}" "${all_defs}")
else()
if(REGISTRY_APPEND)
set_property(GLOBAL APPEND PROPERTY ALL_PKG_INCS "${REGISTRY_INCLUDE_DIRS}")
set_property(GLOBAL APPEND PROPERTY ALL_PKG_LIBS "${REGISTRY_LIBRARIES}")
set_property(GLOBAL APPEND PROPERTY ALL_PKG_DEFS "${REGISTRY_COMPILE_DEFINITIONS}")
endif()
else(REGISTRY_APPEND)
get_property(all_incs GLOBAL PROPERTY ALL_PKG_INCS)
get_property(all_libs GLOBAL PROPERTY ALL_PKG_LIBS)
get_property(all_defs GLOBAL PROPERTY ALL_PKG_DEFS)
set_property(GLOBAL PROPERTY ALL_PKG_INCS "${REGISTRY_INCLUDE_DIRS}" "${all_incs}")
set_property(GLOBAL PROPERTY ALL_PKG_LIBS "${REGISTRY_LIBRARIES}" "${all_libs}")
set_property(GLOBAL PROPERTY ALL_PKG_DEFS "${REGISTRY_COMPILE_DEFINITIONS}" "${all_defs}")
endif(REGISTRY_APPEND)
endfunction(dune_register_package_flags)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment