|
 |
dbd8682 |
diff -rupN gmsh-4.0.0-source/CMakeLists.txt gmsh-4.0.0-source-new/CMakeLists.txt
|
|
|
dbd8682 |
--- gmsh-4.0.0-source/CMakeLists.txt 2018-08-23 11:57:38.816721896 +0200
|
|
|
dbd8682 |
+++ gmsh-4.0.0-source-new/CMakeLists.txt 2018-08-23 11:57:38.952721889 +0200
|
|
|
dbd8682 |
@@ -1769,7 +1769,8 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
|
|
|
8e301b6 |
endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
|
|
|
8e301b6 |
|
|
|
8e301b6 |
if(ENABLE_ONELAB)
|
|
|
8e301b6 |
- install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})
|
|
|
59ccb6f |
+ execute_process ( COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" OUTPUT_VARIABLE PYTHON3_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
59ccb6f |
+ install(FILES ${ONELAB_PY} DESTINATION ${PYTHON3_SITE_PACKAGES})
|
|
|
26afebd |
endif(ENABLE_ONELAB)
|
|
|
26afebd |
if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
|
|
|
dbd8682 |
install(FILES ${GMSH_API} DESTINATION ${GMSH_INC})
|
|
|
dbd8682 |
diff -rupN gmsh-4.0.0-source/Common/GmshMessage.cpp gmsh-4.0.0-source-new/Common/GmshMessage.cpp
|
|
|
dbd8682 |
--- gmsh-4.0.0-source/Common/GmshMessage.cpp 2018-06-27 22:44:49.000000000 +0200
|
|
|
dbd8682 |
+++ gmsh-4.0.0-source-new/Common/GmshMessage.cpp 2018-08-23 11:57:38.953721888 +0200
|
|
|
dbd8682 |
@@ -154,12 +154,6 @@ void Msg::Init(int argc, char **argv)
|
|
|
335d05d |
if(CTX::instance()->exeFileName.empty() && argc && argv)
|
|
|
335d05d |
CTX::instance()->exeFileName = argv[0];
|
|
|
8e301b6 |
|
|
|
335d05d |
- // add the directory where the binary is installed to the path where Python
|
|
|
335d05d |
- // looks for modules, and to the path for executables (this allows us to find
|
|
|
335d05d |
- // the onelab.py module or subclients automatically)
|
|
|
335d05d |
- addGmshPathToEnvironmentVar("PYTHONPATH");
|
|
|
335d05d |
- addGmshPathToEnvironmentVar("PATH");
|
|
|
8e301b6 |
-
|
|
|
8e301b6 |
InitializeOnelab("Gmsh");
|
|
|
8e301b6 |
}
|
|
|
8e301b6 |
|