From 247b2a289287de67a9a113cba9107f512d48552a Mon Sep 17 00:00:00 2001
From: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date: Tue, 8 Jan 2019 11:26:29 +0100
Subject: [PATCH] [cmake] Replace object libraries with interface libraries

---
 libsrc/general/CMakeLists.txt | 14 +++++++-------
 libsrc/gprim/CMakeLists.txt   | 10 +++++-----
 libsrc/linalg/CMakeLists.txt  | 10 +++++-----
 libsrc/meshing/CMakeLists.txt | 12 +++---------
 nglib/CMakeLists.txt          |  5 +----
 5 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/libsrc/general/CMakeLists.txt b/libsrc/general/CMakeLists.txt
index f5c16e82..3f6c2aad 100644
--- a/libsrc/general/CMakeLists.txt
+++ b/libsrc/general/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_definitions(-DNGINTERFACE_EXPORTS)
-add_library(gen OBJECT
-        array.cpp bitarray.cpp dynamicmem.cpp flags.cpp 
-        hashtabl.cpp mystring.cpp optmem.cpp parthreads.cpp
-        seti.cpp sort.cpp spbita2d.cpp table.cpp
-        mpi_interface.cpp gzstream.cpp
+add_library(gen INTERFACE)
+set(sdir ${CMAKE_CURRENT_SOURCE_DIR})
+target_sources(gen INTERFACE
+  ${sdir}/array.cpp ${sdir}/bitarray.cpp ${sdir}/dynamicmem.cpp ${sdir}/flags.cpp
+        ${sdir}/hashtabl.cpp ${sdir}/mystring.cpp ${sdir}/optmem.cpp ${sdir}/parthreads.cpp
+        ${sdir}/seti.cpp ${sdir}/sort.cpp ${sdir}/spbita2d.cpp ${sdir}/table.cpp
+        ${sdir}/mpi_interface.cpp ${sdir}/gzstream.cpp
         )
 
-set_target_properties( gen PROPERTIES POSITION_INDEPENDENT_CODE ON )
-
 install(FILES
   array.hpp autodiff.hpp autoptr.hpp bitarray.hpp
   dynamicmem.hpp flags.hpp hashtabl.hpp mpi_interface.hpp myadt.hpp
diff --git a/libsrc/gprim/CMakeLists.txt b/libsrc/gprim/CMakeLists.txt
index 3957476a..402973dc 100644
--- a/libsrc/gprim/CMakeLists.txt
+++ b/libsrc/gprim/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_definitions(-DNGINTERFACE_EXPORTS)
-add_library(gprim OBJECT
-        adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp 
-        geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp
+add_library(gprim INTERFACE)
+set(sdir ${CMAKE_CURRENT_SOURCE_DIR})
+target_sources(gprim INTERFACE
+        ${sdir}/adtree.cpp ${sdir}/geom2d.cpp ${sdir}/geom3d.cpp ${sdir}/geomfuncs.cpp
+        ${sdir}/geomtest3d.cpp ${sdir}/transform3d.cpp ${sdir}/spline.cpp ${sdir}/splinegeometry.cpp
         )
 
-set_target_properties( gprim PROPERTIES POSITION_INDEPENDENT_CODE ON )
-
 install(FILES
   adtree.hpp geom2d.hpp geom3d.hpp geomfuncs.hpp geomobjects2.hpp
   geomobjects.hpp geomops2.hpp geomops.hpp geomtest3d.hpp gprim.hpp
diff --git a/libsrc/linalg/CMakeLists.txt b/libsrc/linalg/CMakeLists.txt
index a5a5a4f2..a8ab1b5a 100644
--- a/libsrc/linalg/CMakeLists.txt
+++ b/libsrc/linalg/CMakeLists.txt
@@ -1,8 +1,8 @@
-add_library( la OBJECT
-        densemat.cpp polynomial.cpp bfgs.cpp linopt.cpp linsearch.cpp 
-        )
-
-set_target_properties(la PROPERTIES POSITION_INDEPENDENT_CODE ON )
+add_library( la INTERFACE )
+set(sdir ${CMAKE_CURRENT_SOURCE_DIR})
+target_sources( la INTERFACE
+  ${sdir}/densemat.cpp ${sdir}/polynomial.cpp ${sdir}/bfgs.cpp ${sdir}/linopt.cpp ${sdir}/linsearch.cpp
+)
 
 install(FILES
   densemat.hpp linalg.hpp opti.hpp
diff --git a/libsrc/meshing/CMakeLists.txt b/libsrc/meshing/CMakeLists.txt
index bc9f7f18..0c7433cc 100644
--- a/libsrc/meshing/CMakeLists.txt
+++ b/libsrc/meshing/CMakeLists.txt
@@ -1,12 +1,4 @@
 add_definitions(-DNGINTERFACE_EXPORTS)
-if(NOT WIN32)
-    set(mesh_object_libs 
-        $<TARGET_OBJECTS:la>
-        $<TARGET_OBJECTS:gprim>
-        $<TARGET_OBJECTS:gen>
-        )
-endif(NOT WIN32)
-
 add_library(mesh ${NG_LIB_TYPE}
         adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp 
         clusters.cpp curvedelems.cpp delaunay.cpp delaunay2d.cpp	    
@@ -29,8 +21,10 @@ if(APPLE)
     set_target_properties( mesh PROPERTIES SUFFIX ".so")
 endif(APPLE)
 
+target_link_libraries( mesh PUBLIC ngcore PRIVATE gprim la gen )
+
 if(NOT WIN32)
-    target_link_libraries( mesh ngcore ${ZLIB_LIBRARIES} ${MPI_CXX_LIBRARIES} ${PYTHON_LIBRARIES} ${METIS_LIBRARY})
+    target_link_libraries( mesh PUBLIC ${ZLIB_LIBRARIES} ${MPI_CXX_LIBRARIES} ${PYTHON_LIBRARIES} ${METIS_LIBRARY})
     install( TARGETS mesh ${NG_INSTALL_DIR})
 endif(NOT WIN32)
 
diff --git a/nglib/CMakeLists.txt b/nglib/CMakeLists.txt
index ff8bd1d5..5f705c8c 100644
--- a/nglib/CMakeLists.txt
+++ b/nglib/CMakeLists.txt
@@ -8,9 +8,6 @@ if(WIN32)
           $<TARGET_OBJECTS:geom2d>
           $<TARGET_OBJECTS:csg>
           $<TARGET_OBJECTS:stl>
-          $<TARGET_OBJECTS:gen>
-          $<TARGET_OBJECTS:la>
-          $<TARGET_OBJECTS:gprim>
 
           $<TARGET_OBJECTS:visual>
           $<TARGET_OBJECTS:occ>
@@ -32,7 +29,7 @@ if(NOT WIN32)
       endif(USE_GUI)
 endif(NOT WIN32)
 
-target_link_libraries(nglib PUBLIC ngcore)
+target_link_libraries(nglib PRIVATE gen la gprim PUBLIC ngcore)
 
 target_link_libraries( nglib PRIVATE ${OCC_LIBRARIES} ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${X11_Xmu_LIB} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} ${OCC_LIBRARIES} )