diff -rupN --no-dereference netgen-6.2.2101/libsrc/csg/CMakeLists.txt netgen-6.2.2101-new/libsrc/csg/CMakeLists.txt --- netgen-6.2.2101/libsrc/csg/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/libsrc/csg/CMakeLists.txt 2021-01-24 22:34:32.529550110 +0100 @@ -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) @@ -21,6 +25,10 @@ target_link_libraries(csg PUBLIC ngcore) if(USE_GUI) add_library(csgvis ${NG_LIB_TYPE} vscsg.cpp ) target_link_libraries(csgvis PRIVATE "$" PUBLIC ngcore) + + 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 PUBLIC csg visual) if(APPLE) diff -rupN --no-dereference netgen-6.2.2101/libsrc/geom2d/CMakeLists.txt netgen-6.2.2101-new/libsrc/geom2d/CMakeLists.txt --- netgen-6.2.2101/libsrc/geom2d/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/libsrc/geom2d/CMakeLists.txt 2021-01-24 22:34:32.529550110 +0100 @@ -1,5 +1,7 @@ add_definitions(-DNGLIB_EXPORTS) add_library(geom2d ${NG_LIB_TYPE} csg2d.cpp genmesh2d.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) @@ -12,6 +14,8 @@ endif(NOT WIN32) if(USE_GUI) add_library(geom2dvis ${NG_LIB_TYPE} vsgeom2d.cpp) target_link_libraries(geom2dvis PUBLIC ngcore) + 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 PUBLIC geom2d) install( TARGETS geom2dvis ${NG_INSTALL_DIR}) diff -rupN --no-dereference netgen-6.2.2101/libsrc/interface/CMakeLists.txt netgen-6.2.2101-new/libsrc/interface/CMakeLists.txt --- netgen-6.2.2101/libsrc/interface/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/libsrc/interface/CMakeLists.txt 2021-01-24 22:34:32.529550110 +0100 @@ -9,6 +9,9 @@ add_library(interface ${NG_LIB_TYPE} target_link_libraries(interface PUBLIC mesh csg geom2d stl visual PRIVATE netgen_cgns) +set_target_properties(interface PROPERTIES OUTPUT_NAME "nginterface") +set_target_properties(interface PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}) + if(NOT WIN32) install( TARGETS interface ${NG_INSTALL_DIR}) endif(NOT WIN32) diff -rupN --no-dereference netgen-6.2.2101/libsrc/meshing/CMakeLists.txt netgen-6.2.2101-new/libsrc/meshing/CMakeLists.txt --- netgen-6.2.2101/libsrc/meshing/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/libsrc/meshing/CMakeLists.txt 2021-01-24 22:34:32.530550103 +0100 @@ -17,6 +17,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 -rupN --no-dereference netgen-6.2.2101/libsrc/occ/CMakeLists.txt netgen-6.2.2101-new/libsrc/occ/CMakeLists.txt --- netgen-6.2.2101/libsrc/occ/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/libsrc/occ/CMakeLists.txt 2021-01-24 22:34:32.530550103 +0100 @@ -4,8 +4,12 @@ add_library(occ ${NG_LIB_TYPE} Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp python_occ.cpp ) +set_target_properties(occ PROPERTIES OUTPUT_NAME "ngocc") +set_target_properties(occ PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}) if(USE_GUI) 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}) target_link_libraries(occvis PUBLIC ngcore) endif(USE_GUI) diff -rupN --no-dereference netgen-6.2.2101/libsrc/stlgeom/CMakeLists.txt netgen-6.2.2101-new/libsrc/stlgeom/CMakeLists.txt --- netgen-6.2.2101/libsrc/stlgeom/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/libsrc/stlgeom/CMakeLists.txt 2021-01-24 22:34:32.530550103 +0100 @@ -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 PUBLIC mesh ) install( TARGETS stl ${NG_INSTALL_DIR}) @@ -13,6 +17,10 @@ target_link_libraries( stl PUBLIC ngcore if(USE_GUI) add_library(stlvis ${NG_LIB_TYPE} vsstl.cpp) target_link_libraries(stlvis PRIVATE "$" PUBLIC ngcore) + + 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 PUBLIC stl ) install( TARGETS stlvis ${NG_INSTALL_DIR}) diff -rupN --no-dereference netgen-6.2.2101/libsrc/visualization/CMakeLists.txt netgen-6.2.2101-new/libsrc/visualization/CMakeLists.txt --- netgen-6.2.2101/libsrc/visualization/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/libsrc/visualization/CMakeLists.txt 2021-01-24 22:34:32.530550103 +0100 @@ -8,6 +8,9 @@ else(USE_GUI) 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}) + target_link_libraries( visual PUBLIC ngcore PRIVATE "$" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ) install( TARGETS visual ${NG_INSTALL_DIR}) diff -rupN --no-dereference netgen-6.2.2101/ng/CMakeLists.txt netgen-6.2.2101-new/ng/CMakeLists.txt --- netgen-6.2.2101/ng/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/ng/CMakeLists.txt 2021-01-24 22:34:32.530550103 +0100 @@ -49,6 +49,9 @@ if(USE_GUI) endif(WIN32) target_link_libraries( gui PRIVATE "$" ) + set_target_properties( gui PROPERTIES OUTPUT_NAME "nggui" ) + set_target_properties( gui PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR} ) + endif(USE_GUI) if(USE_PYTHON) diff -rupN --no-dereference netgen-6.2.2101/ng/ng.tcl netgen-6.2.2101-new/ng/ng.tcl --- netgen-6.2.2101/ng/ng.tcl 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/ng/ng.tcl 2021-01-24 22:34:32.530550103 +0100 @@ -2,7 +2,7 @@ catch {lappend auto_path $env(NETGENDIR) catch {lappend auto_path $env(NETGENDIR)/../lib } if {[catch {Ng_GetCommandLineParameter batchmode} result ]} { - load libgui[info sharedlibextension] gui + load libnggui[info sharedlibextension].6.2 gui } set batchmode [Ng_GetCommandLineParameter batchmode] diff -rupN --no-dereference netgen-6.2.2101/ng/onetcl.cpp netgen-6.2.2101-new/ng/onetcl.cpp --- netgen-6.2.2101/ng/onetcl.cpp 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/ng/onetcl.cpp 2021-01-24 22:34:32.531550095 +0100 @@ -3,7 +3,7 @@ DLL_HEADER const char * ngscript[] = {"" ,"catch {lappend auto_path $env(NETGENDIR) }\n" ,"catch {lappend auto_path $env(NETGENDIR)/../lib }\n" ,"if {[catch {Ng_GetCommandLineParameter batchmode} result ]} {\n" -,"load libgui[info sharedlibextension] gui\n" +,"load libnggui[info sharedlibextension].6.2 gui\n" ,"}\n" ,"set batchmode [Ng_GetCommandLineParameter batchmode]\n" ,"if {$batchmode==\"undefined\"} {\n" diff -rupN --no-dereference netgen-6.2.2101/ng/Togl2.1/CMakeLists.txt netgen-6.2.2101-new/ng/Togl2.1/CMakeLists.txt --- netgen-6.2.2101/ng/Togl2.1/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/ng/Togl2.1/CMakeLists.txt 2021-01-24 22:34:32.532550088 +0100 @@ -22,6 +22,9 @@ else(WIN32) add_library(togl togl.c toglProcAddr.c toglStubInit.c) target_link_libraries(togl -ldl) + + set_target_properties(togl PROPERTIES OUTPUT_NAME "ngtogl") + set_target_properties(togl PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}) endif(WIN32) target_link_libraries(togl ${OPENGL_LIBRARIES}) diff -rupN --no-dereference netgen-6.2.2101/nglib/CMakeLists.txt netgen-6.2.2101-new/nglib/CMakeLists.txt --- netgen-6.2.2101/nglib/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/nglib/CMakeLists.txt 2021-01-24 22:34:32.532550088 +0100 @@ -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 PUBLIC mesh interface geom2d csg stl visual) if(USE_GUI) diff -rupN --no-dereference netgen-6.2.2101/python/gui.py netgen-6.2.2101-new/python/gui.py --- netgen-6.2.2101/python/gui.py 2021-01-15 15:50:18.000000000 +0100 +++ netgen-6.2.2101-new/python/gui.py 2021-01-24 22:34:32.532550088 +0100 @@ -8,7 +8,7 @@ def StartGUI(): win.tk.eval('lappend ::auto_path ' + netgen._netgen_lib_dir) win.tk.eval('lappend ::auto_path ' + netgen._netgen_bin_dir) # load with absolute path to avoid issues on MacOS - win.tk.eval('load "'+netgen._netgen_lib_dir.replace('\\','/')+'/libgui[info sharedlibextension]" gui') + win.tk.eval('load "'+netgen._netgen_lib_dir.replace('\\','/')+'/libnggui[info sharedlibextension].6.2" gui') win.tk.eval( netgen.libngpy._meshing._ngscript) try: