Blob Blame History Raw
diff -rupN --no-dereference netgen-6.2.2202/libsrc/csg/CMakeLists.txt netgen-6.2.2202-new/libsrc/csg/CMakeLists.txt
--- netgen-6.2.2202/libsrc/csg/CMakeLists.txt	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/libsrc/csg/CMakeLists.txt	2022-03-14 23:22:34.067557948 +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 "$<BUILD_INTERFACE:netgen_python>" 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.2202/libsrc/geom2d/CMakeLists.txt netgen-6.2.2202-new/libsrc/geom2d/CMakeLists.txt
--- netgen-6.2.2202/libsrc/geom2d/CMakeLists.txt	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/libsrc/geom2d/CMakeLists.txt	2022-03-14 23:22:34.067557948 +0100
@@ -1,5 +1,7 @@
 add_definitions(-DNGINTERFACE_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.2202/libsrc/interface/CMakeLists.txt netgen-6.2.2202-new/libsrc/interface/CMakeLists.txt
--- netgen-6.2.2202/libsrc/interface/CMakeLists.txt	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/libsrc/interface/CMakeLists.txt	2022-03-14 23:22:34.067557948 +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.2202/libsrc/meshing/CMakeLists.txt netgen-6.2.2202-new/libsrc/meshing/CMakeLists.txt
--- netgen-6.2.2202/libsrc/meshing/CMakeLists.txt	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/libsrc/meshing/CMakeLists.txt	2022-03-14 23:22:34.067557948 +0100
@@ -33,6 +33,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.2202/libsrc/occ/CMakeLists.txt netgen-6.2.2202-new/libsrc/occ/CMakeLists.txt
--- netgen-6.2.2202/libsrc/occ/CMakeLists.txt	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/libsrc/occ/CMakeLists.txt	2022-03-14 23:22:34.067557948 +0100
@@ -8,8 +8,12 @@ add_library(occ ${NG_LIB_TYPE}
         python_occ_basic.cpp python_occ_shapes.cpp
         occ_face.cpp occ_edge.cpp occ_vertex.cpp occ_utils.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.2202/libsrc/stlgeom/CMakeLists.txt netgen-6.2.2202-new/libsrc/stlgeom/CMakeLists.txt
--- netgen-6.2.2202/libsrc/stlgeom/CMakeLists.txt	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/libsrc/stlgeom/CMakeLists.txt	2022-03-14 23:22:34.068557946 +0100
@@ -4,6 +4,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})
@@ -14,6 +18,10 @@ target_link_libraries( stl PUBLIC ngcore
 if(USE_GUI)
     add_library(stlvis ${NG_LIB_TYPE} vsstl.cpp)
     target_link_libraries(stlvis PRIVATE "$<BUILD_INTERFACE:netgen_python>" 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.2202/libsrc/visualization/CMakeLists.txt netgen-6.2.2202-new/libsrc/visualization/CMakeLists.txt
--- netgen-6.2.2202/libsrc/visualization/CMakeLists.txt	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/libsrc/visualization/CMakeLists.txt	2022-03-14 23:22:34.068557946 +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 "$<BUILD_INTERFACE:netgen_python>" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} )
 install( TARGETS visual ${NG_INSTALL_DIR})
diff -rupN --no-dereference netgen-6.2.2202/ng/CMakeLists.txt netgen-6.2.2202-new/ng/CMakeLists.txt
--- netgen-6.2.2202/ng/CMakeLists.txt	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/ng/CMakeLists.txt	2022-03-14 23:22:34.068557946 +0100
@@ -50,6 +50,9 @@ if(USE_GUI)
     endif(WIN32)
     target_link_libraries( gui PRIVATE "$<BUILD_INTERFACE:netgen_python>" )
 
+    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.2202/ng/ng.tcl netgen-6.2.2202-new/ng/ng.tcl
--- netgen-6.2.2202/ng/ng.tcl	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/ng/ng.tcl	2022-03-14 23:22:34.068557946 +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.2202/ng/onetcl.cpp netgen-6.2.2202-new/ng/onetcl.cpp
--- netgen-6.2.2202/ng/onetcl.cpp	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/ng/onetcl.cpp	2022-03-14 23:22:34.069557945 +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.2202/ng/Togl2.1/CMakeLists.txt netgen-6.2.2202-new/ng/Togl2.1/CMakeLists.txt
--- netgen-6.2.2202/ng/Togl2.1/CMakeLists.txt	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/ng/Togl2.1/CMakeLists.txt	2022-03-14 23:22:34.069557945 +0100
@@ -22,6 +22,9 @@ else(WIN32)
 
   add_library(togl togl.c toglProcAddr.c toglStubInit.c)
   target_link_libraries(togl ${TCL_STUB_LIBRARY} ${TK_STUB_LIBRARY})
+
+  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.2202/nglib/CMakeLists.txt netgen-6.2.2202-new/nglib/CMakeLists.txt
--- netgen-6.2.2202/nglib/CMakeLists.txt	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/nglib/CMakeLists.txt	2022-03-14 23:22:34.069557945 +0100
@@ -23,6 +23,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.2202/python/gui.py netgen-6.2.2202-new/python/gui.py
--- netgen-6.2.2202/python/gui.py	2022-03-11 12:48:52.000000000 +0100
+++ netgen-6.2.2202-new/python/gui.py	2022-03-14 23:22:34.069557945 +0100
@@ -18,7 +18,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')
 
     if config.is_python_package and 'darwin' in sys.platform:
         # libngsolve and other libraries are installed into netgen python dir to keep relative installation paths, but tcl won't find them there automatically
diff -rupN --no-dereference netgen-6.2.2202/python/gui.py.rej netgen-6.2.2202-new/python/gui.py.rej
--- netgen-6.2.2202/python/gui.py.rej	1970-01-01 01:00:00.000000000 +0100
+++ netgen-6.2.2202-new/python/gui.py.rej	2022-03-14 23:22:34.069557945 +0100
@@ -0,0 +1,11 @@
+--- python/gui.py	2021-10-02 15:32:02.000000000 +0200
++++ python/gui.py	2021-10-04 10:13:57.681144862 +0200
+@@ -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: