ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-13 14:40:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dont_import_tkinter' into 'master'

Browse Source 
Don't import tkinter

See merge request jschoeberl/netgen!220
This commit is contained in:
Christopher Lackner 2019-08-28 11:48:09 +00:00
commit 38d8d0cd71
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/core/CMakeLists.txt
View File

@ -24,6 +24,10 @@ if(NOT WIN32)
target_compile_options(ngcore PRIVATE -fvisibility=hidden) target_compile_options(ngcore PRIVATE -fvisibility=hidden)
endif(NOT WIN32) endif(NOT WIN32)
if(WIN32)
target_compile_options(ngcore PUBLIC /bigobj)
endif(WIN32)
target_compile_definitions(ngcore PUBLIC $<$<CONFIG:DEBUG>:NETGEN_ENABLE_CHECK_RANGE>) target_compile_definitions(ngcore PUBLIC $<$<CONFIG:DEBUG>:NETGEN_ENABLE_CHECK_RANGE>)
if(CHECK_RANGE) if(CHECK_RANGE)

2
libsrc/stlgeom/vsstl.hpp
View File

@ -18,7 +18,7 @@ namespace netgen
public: public:
DLL_HEADER VisualSceneSTLGeometry (); DLL_HEADER VisualSceneSTLGeometry ();
DLL_HEADER virtual ~VisualSceneSTLGeometry (); DLL_HEADER virtual ~VisualSceneSTLGeometry ();
DLL_HEADER void SetGeometry (class STLGeometry * astlgeometry) { stlgeometry = astlgeometry; } void SetGeometry (class STLGeometry * astlgeometry) { stlgeometry = astlgeometry; }
DLL_HEADER virtual void BuildScene (int zoomall = 0); DLL_HEADER virtual void BuildScene (int zoomall = 0);
DLL_HEADER virtual void DrawScene (); DLL_HEADER virtual void DrawScene ();

5
python/CMakeLists.txt
View File

@ -1,8 +1,3 @@
if(USE_GUI)
set(IMPORT_TKINTER True)
else()
set(IMPORT_TKINTER False)
endif()
configure_file(__init__.py ${CMAKE_CURRENT_BINARY_DIR}/__init__.py @ONLY) configure_file(__init__.py ${CMAKE_CURRENT_BINARY_DIR}/__init__.py @ONLY)
install(FILES install(FILES

4
python/__init__.py
View File

@ -1,10 +1,6 @@
import os import os
import sys import sys
# import tkinter only if Netgen was configured with USE_GUI=ON
if @IMPORT_TKINTER@:
import tkinter
_netgen_bin_dir=os.path.realpath(os.path.join(os.path.dirname(__file__),'..','@NETGEN_PYTHON_RPATH_BIN@')) _netgen_bin_dir=os.path.realpath(os.path.join(os.path.dirname(__file__),'..','@NETGEN_PYTHON_RPATH_BIN@'))
_netgen_lib_dir=os.path.realpath(os.path.join(os.path.dirname(__file__),'..','@NETGEN_PYTHON_RPATH@')) _netgen_lib_dir=os.path.realpath(os.path.join(os.path.dirname(__file__),'..','@NETGEN_PYTHON_RPATH@'))