Make devS a DUNE library and reuse devices object library.

dev/CMakeLists.txt

@@ -5,11 +5,12 @@
 
 set(SOURCES  ugdevices.cc sockcomm.cc
   ppm/ppm.cc meta/metafile.cc ps/postscript.cc ps/postscriptbw.cc)
-set(devincludedir  ${CMAKE_INSTALL_INCLUDEDIR})
 set(devinclude_HEADERS  ugdevices.h)
 
 add_library(devices OBJECT ${SOURCES})
-add_library(devS ${SOURCES} sif/sif.cc)
+# We need a unique name for the object library that will become libdevS
+# later in lib
+add_library(devSo OBJECT $<TARGET_OBJECTS:devices> sif/sif.cc)
 add_library(devR ${SOURCES} rif/remote.cc)
 add_library(devX xif/xmain.cc xif/xgraph.cc xif/xshell.cc
   $<TARGET_OBJECTS:devices>)

lib/CMakeLists.txt

@@ -7,6 +7,8 @@ endif()
 
 set(_dim_libs ug_gm gg np algebra amg field procs udm graphics uggrape uggraph ugui low)
 
+
+dune_add_library(devS APPEND $<TARGET_OBJECTS:devSo>)
 ug_add_dim_libs(ugL SOURCES ../initug.cc OBJECT_DIM_LIBS ${_dim_libs} domL ngin OBJECT_LIBS  devices low)
 ug_add_dim_libs(ugS APPEND DUNE SOURCES ../initug.cc
   OBJECT_DIM_LIBS ${_dim_libs} domS ${_parallel_dim_libs}