Merge branch 'cherry-pick-6ff6e1ed' into 'releases/2.5'

Merge branch 'bugfix/dim-indep-objects-should-only-be-in-one-library' into 'master'

See merge request !67

lib/CMakeLists.txt

@@ -7,14 +7,17 @@ endif()
 
 set(_dim_libs ug_gm np algebra udm ugui low)
 
-ug_add_dim_libs(ugL SOURCES ../initug.cc OBJECT_DIM_LIBS ${_dim_libs} OBJECT_LIBS  devices low)
+foreach(_l ${_parallel_libs})
+  list(APPEND _parallel_objs $<TARGET_OBJECTS:${_l}>)
+endforeach()
+
+dune_add_library(ugL $<TARGET_OBJECTS:devices> $<TARGET_OBJECTS:low> ${_parallel_objs})
 ug_add_dim_libs(ugS APPEND DUNE SOURCES ../initug.cc
   OBJECT_DIM_LIBS ${_dim_libs} domS ${_parallel_dim_libs}
-  OBJECT_LIBS devices low ${_parallel_libs})
+  ADD_LIBS ugL
+  )
 
 if(MPI_C_FOUND)
+  add_dune_mpi_flags(ugL)
   add_dune_mpi_flags(ugS2 ugS3)
 endif()
-
-
-install(TARGETS ugL2 ugL3 DESTINATION ${CMAKE_INSTALL_LIBDIR})

low/test/CMakeLists.txt

 dune_add_test(SOURCES test-fifo.cc)
-target_link_libraries(test-fifo ugL2)
+target_link_libraries(test-fifo ugL)