|
 |
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-29 10:24:05.651924683 +0200
|
|
|
dbd8682 |
+++ gmsh-4.0.0-source-new/CMakeLists.txt 2018-08-29 10:24:05.776924676 +0200
|
|
|
dbd8682 |
@@ -1748,6 +1748,8 @@ else(WIN32 OR CYGWIN)
|
|
|
dbd8682 |
set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR})
|
|
|
dbd8682 |
endif(WIN32 OR CYGWIN)
|
|
|
dbd8682 |
|
|
|
dbd8682 |
+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)
|
|
|
dbd8682 |
+
|
|
|
dbd8682 |
# FIXME: change this once we understand rpaths
|
|
|
dbd8682 |
if(APPLE)
|
|
|
dbd8682 |
if(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED)
|
|
|
dbd8682 |
@@ -1769,11 +1771,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
|
|
|
dbd8682 |
endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
|
|
|
dbd8682 |
|
|
|
dbd8682 |
if(ENABLE_ONELAB)
|
|
|
dbd8682 |
- install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})
|
|
|
dbd8682 |
+ install(FILES ${ONELAB_PY} DESTINATION ${PYTHON3_SITE_PACKAGES})
|
|
|
dbd8682 |
endif(ENABLE_ONELAB)
|
|
|
dbd8682 |
if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
|
|
|
dbd8682 |
install(FILES ${GMSH_API} DESTINATION ${GMSH_INC})
|
|
|
dbd8682 |
- install(FILES ${GMSH_PY} DESTINATION ${GMSH_LIB})
|
|
|
dbd8682 |
+ install(FILES ${GMSH_PY} DESTINATION ${PYTHON3_SITE_PACKAGES})
|
|
|
dbd8682 |
install(FILES ${GMSH_JL} DESTINATION ${GMSH_LIB})
|
|
|
dbd8682 |
if(ENABLE_PRIVATE_API)
|
|
|
dbd8682 |
install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh)
|
|
|
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-29 10:24:05.777924676 +0200
|
|
|
dbd8682 |
@@ -154,12 +154,6 @@ void Msg::Init(int argc, char **argv)
|
|
|
dbd8682 |
if(CTX::instance()->exeFileName.empty() && argc && argv)
|
|
|
dbd8682 |
CTX::instance()->exeFileName = argv[0];
|
|
|
dbd8682 |
|
|
|
dbd8682 |
- // add the directory where the binary is installed to the path where Python
|
|
|
dbd8682 |
- // looks for modules, and to the path for executables (this allows us to find
|
|
|
dbd8682 |
- // the onelab.py module or subclients automatically)
|
|
|
dbd8682 |
- addGmshPathToEnvironmentVar("PYTHONPATH");
|
|
|
dbd8682 |
- addGmshPathToEnvironmentVar("PATH");
|
|
|
dbd8682 |
-
|
|
|
dbd8682 |
InitializeOnelab("Gmsh");
|
|
|
dbd8682 |
}
|
|
|
dbd8682 |
|