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