From ac95890c8ad73f29c4fdf4bc009530437abb04ac Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 1 May 2017 23:06:11 +0200
Subject: [PATCH 2/8] Rename libraries, add library versions
---
libsrc/csg/CMakeLists.txt | 8 ++++++++
libsrc/general/CMakeLists.txt | 3 +++
libsrc/geom2d/CMakeLists.txt | 8 ++++++++
libsrc/gprim/CMakeLists.txt | 3 +++
libsrc/interface/CMakeLists.txt | 3 +++
libsrc/linalg/CMakeLists.txt | 3 +++
libsrc/meshing/CMakeLists.txt | 3 +++
libsrc/occ/CMakeLists.txt | 6 ++++++
libsrc/stlgeom/CMakeLists.txt | 8 ++++++++
libsrc/visualization/CMakeLists.txt | 3 +++
nglib/CMakeLists.txt | 1 +
11 files changed, 49 insertions(+)
diff --git a/libsrc/csg/CMakeLists.txt b/libsrc/csg/CMakeLists.txt
index 510b0e0..94d2465 100644
--- a/libsrc/csg/CMakeLists.txt
+++ b/libsrc/csg/CMakeLists.txt
@@ -7,6 +7,10 @@ add_library(csg ${NG_LIB_TYPE}
solid.cpp specpoin.cpp spline3d.cpp surface.cpp triapprox.cpp zrefine.cpp
python_csg.cpp splinesurface.cpp
)
+
+set_target_properties(csg PROPERTIES OUTPUT_NAME "ngcsg")
+set_target_properties(csg PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
if(APPLE)
set_target_properties( csg PROPERTIES SUFFIX ".so")
endif(APPLE)
@@ -20,6 +24,10 @@ endif(NOT WIN32)
if(USE_GUI)
add_library(csgvis ${NG_LIB_TYPE} vscsg.cpp )
+
+ set_target_properties(csgvis PROPERTIES OUTPUT_NAME "ngcsgvis")
+ set_target_properties(csgvis PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
if(NOT WIN32)
target_link_libraries(csgvis csg visual)
if(APPLE)
diff --git a/libsrc/general/CMakeLists.txt b/libsrc/general/CMakeLists.txt
index 811bc80..d0ce0f3 100644
--- a/libsrc/general/CMakeLists.txt
+++ b/libsrc/general/CMakeLists.txt
@@ -6,6 +6,9 @@ add_library(gen OBJECT
mpi_interface.cpp gzstream.cpp
)
+set_target_properties(gen PROPERTIES OUTPUT_NAME "nggen")
+set_target_properties(gen PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
set_target_properties( gen PROPERTIES POSITION_INDEPENDENT_CODE ON )
install( FILES ngexception.hpp DESTINATION ${INCDIR} COMPONENT netgen_devel )
diff --git a/libsrc/geom2d/CMakeLists.txt b/libsrc/geom2d/CMakeLists.txt
index 332fe06..59eaffe 100644
--- a/libsrc/geom2d/CMakeLists.txt
+++ b/libsrc/geom2d/CMakeLists.txt
@@ -1,5 +1,9 @@
add_definitions(-DNGLIB_EXPORTS)
add_library(geom2d ${NG_LIB_TYPE} genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp python_geom2d.cpp )
+
+set_target_properties(geom2d PROPERTIES OUTPUT_NAME "nggeom2d")
+set_target_properties(geom2d PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
if(APPLE)
set_target_properties( geom2d PROPERTIES SUFFIX ".so")
endif(APPLE)
@@ -11,6 +15,10 @@ endif(NOT WIN32)
if(USE_GUI)
add_library(geom2dvis ${NG_LIB_TYPE} vsgeom2d.cpp)
+
+ set_target_properties(geom2dvis PROPERTIES OUTPUT_NAME "nggeom2dvis")
+ set_target_properties(geom2dvis PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
if(NOT WIN32)
target_link_libraries(geom2dvis geom2d)
install( TARGETS geom2dvis ${ng_install_dir})
diff --git a/libsrc/gprim/CMakeLists.txt b/libsrc/gprim/CMakeLists.txt
index 4bf13c6..d6ea1c6 100644
--- a/libsrc/gprim/CMakeLists.txt
+++ b/libsrc/gprim/CMakeLists.txt
@@ -4,6 +4,9 @@ add_library(gprim OBJECT
geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp
)
+set_target_properties(gprim PROPERTIES OUTPUT_NAME "nggprim")
+set_target_properties(gprim PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
set_target_properties( gprim PROPERTIES POSITION_INDEPENDENT_CODE ON )
install(FILES
diff --git a/libsrc/interface/CMakeLists.txt b/libsrc/interface/CMakeLists.txt
index aca5706..53a8cf9 100644
--- a/libsrc/interface/CMakeLists.txt
+++ b/libsrc/interface/CMakeLists.txt
@@ -13,6 +13,9 @@ add_library(interface ${NG_LIB_TYPE}
wuchemnitz.cpp writegmsh2.cpp writeOpenFOAM15x.cpp
)
+set_target_properties(interface PROPERTIES OUTPUT_NAME "nginterface")
+set_target_properties(interface PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
# TARGET_LINK_LIBRARIES(interface ${MPI_CXX_LIBRARIES} ${PYTHON_LIBS})
# TARGET_LINK_LIBRARIES( interface ${LIBPTHREAD} ${OCC_LIBRARIES} ${LIBTOGL} ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ${TK_LIBRARY} ${TCL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${X11_Xmu_LIB} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} )
if(NOT WIN32)
diff --git a/libsrc/linalg/CMakeLists.txt b/libsrc/linalg/CMakeLists.txt
index e50fb5b..b9e4919 100644
--- a/libsrc/linalg/CMakeLists.txt
+++ b/libsrc/linalg/CMakeLists.txt
@@ -2,6 +2,9 @@ add_library( la OBJECT
densemat.cpp polynomial.cpp bfgs.cpp linopt.cpp linsearch.cpp
)
+set_target_properties(la PROPERTIES OUTPUT_NAME "ngla")
+set_target_properties(la PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
set_target_properties(la PROPERTIES POSITION_INDEPENDENT_CODE ON )
install(FILES
diff --git a/libsrc/meshing/CMakeLists.txt b/libsrc/meshing/CMakeLists.txt
index 959f286..ea0ebff 100644
--- a/libsrc/meshing/CMakeLists.txt
+++ b/libsrc/meshing/CMakeLists.txt
@@ -24,6 +24,9 @@ add_library(mesh ${NG_LIB_TYPE}
${mesh_object_libs}
)
+set_target_properties(mesh PROPERTIES OUTPUT_NAME "ngmesh")
+set_target_properties(mesh PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
if(APPLE)
set_target_properties( mesh PROPERTIES SUFFIX ".so")
endif(APPLE)
diff --git a/libsrc/occ/CMakeLists.txt b/libsrc/occ/CMakeLists.txt
index 8f7f7c3..8865a9a 100644
--- a/libsrc/occ/CMakeLists.txt
+++ b/libsrc/occ/CMakeLists.txt
@@ -5,8 +5,14 @@ add_library(occ ${NG_LIB_TYPE}
occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp
)
+set_target_properties(occ PROPERTIES OUTPUT_NAME "ngocc")
+set_target_properties(occ PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
add_library(occvis ${NG_LIB_TYPE} vsocc.cpp)
+set_target_properties(occvis PROPERTIES OUTPUT_NAME "ngoccvis")
+set_target_properties(occvis PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
if(NOT WIN32)
target_link_libraries( occ ${OCC_LIBRARIES} ${PYTHON_LIBRARIES})
target_link_libraries( occvis occ )
diff --git a/libsrc/stlgeom/CMakeLists.txt b/libsrc/stlgeom/CMakeLists.txt
index d2072a1..8241e95 100644
--- a/libsrc/stlgeom/CMakeLists.txt
+++ b/libsrc/stlgeom/CMakeLists.txt
@@ -3,6 +3,10 @@ add_library(stl ${NG_LIB_TYPE}
stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp python_stl.cpp
)
+
+set_target_properties(stl PROPERTIES OUTPUT_NAME "ngstl")
+set_target_properties(stl PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
if(NOT WIN32)
target_link_libraries( stl mesh ${PYTHON_LIBRARIES})
target_link_libraries( stl ${PYTHON_LIBRARIES})
@@ -13,6 +17,10 @@ if(USE_GUI)
add_library(stlvis ${NG_LIB_TYPE}
vsstl.cpp
)
+
+ set_target_properties(stlvis PROPERTIES OUTPUT_NAME "ngstlvis")
+ set_target_properties(stlvis PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
if(NOT WIN32)
target_link_libraries( stlvis stl )
install( TARGETS stlvis ${ng_install_dir})
diff --git a/libsrc/visualization/CMakeLists.txt b/libsrc/visualization/CMakeLists.txt
index 5031cba..2768553 100644
--- a/libsrc/visualization/CMakeLists.txt
+++ b/libsrc/visualization/CMakeLists.txt
@@ -11,6 +11,9 @@ endif(USE_GUI)
add_library(visual ${NG_LIB_TYPE} ${LIB_VISUAL_SOURCES})
+set_target_properties(visual PROPERTIES OUTPUT_NAME "ngvisual")
+set_target_properties(visual PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
+
if(NOT WIN32)
target_link_libraries( visual ${PYTHON_LIBRARIES} ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ${TCL_LIBRARY} )
install( TARGETS visual ${ng_install_dir})
diff --git a/nglib/CMakeLists.txt b/nglib/CMakeLists.txt
index eb18a63..461515f 100644
--- a/nglib/CMakeLists.txt
+++ b/nglib/CMakeLists.txt
@@ -21,6 +21,7 @@ if(WIN32)
endif(WIN32)
add_library(nglib SHARED nglib.cpp ${nglib_objects})
+set_target_properties(nglib PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR})
if(NOT WIN32)
target_link_libraries( nglib mesh stl interface geom2d csg stl visual)
if(USE_GUI)
--
2.12.2