Skip to content
Snippets Groups Projects
Commit f9021be2 authored by Markus Blatt's avatar Markus Blatt
Browse files

[Merge][CMake] Merged revisions : 6669

Revision  r6669
.----------------------
Provide exported libraries.
Added function to link to default libraries.

.----------------------


[[Imported from SVN: r7196]]
parents bcb11c19 4fdc4054
No related branches found
No related tags found
No related merge requests found
......@@ -12,4 +12,5 @@ set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
\ No newline at end of file
set(@DUNE_MOD_NAME_UPPERCASE@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
set(@DUNE_MOD_NAME_UPPERCASE@_LIBS "dunecommon")
\ No newline at end of file
......@@ -195,6 +195,14 @@ macro(dune_project)
# set includes
dune_module_to_uppercase(_upper_case "${_mod}")
include_directories("${${_upper_case}_INCLUDE_DIRS}")
message("${_upper_case}_LIBS=${${_upper_case}_LIBS}")
if(${_upper_case}_LIBS)
foreach(_lib ${${_upper_case}_LIBS})
message("_lib=${_lib}")
list(APPEND DUNE_DEFAULT_LIBS "${_lib}")
endforeach(_lib ${${_upper_case}_LIBS})
message("DUNE_DEFAULT_LIBS=${DUNE_DEFAULT_LIBS}")
endif(${_upper_case}_LIBS)
endforeach(_mod DEPENDENCY_TREE)
# Search for a cmake files containing tests and directives
......@@ -290,7 +298,11 @@ MACRO(finalize_dune_project)
ENDMACRO(finalize_dune_project)
MACRO(target_link_dune_default_libraries _target)
add_DUNE_MPI_flags(${_target})
message("libs ${DUNE_DEFAULT_LIBS}")
foreach(_lib ${DUNE_DEFAULT_LIBS})
message("lib=${_lib}")
target_link_libraries(${_target} ${_lib})
endforeach(_lib ${DUNE_DEFAULT_LIBS})
ENDMACRO(target_link_dune_default_libraries)
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