|
 |
2f3a0d7 |
diff -rupN gmsh-3.0.6-source/CMakeLists.txt gmsh-3.0.6-source-new/CMakeLists.txt
|
|
|
2f3a0d7 |
--- gmsh-3.0.6-source/CMakeLists.txt 2017-11-05 16:49:19.133094121 +0100
|
|
|
2f3a0d7 |
+++ gmsh-3.0.6-source-new/CMakeLists.txt 2017-11-05 16:49:19.361093871 +0100
|
|
|
2f3a0d7 |
@@ -1723,8 +1723,9 @@ elseif(APPLE AND ENABLE_OS_SPECIFIC_INST
|
|
|
26afebd |
set(GMSH_DOC ../../..)
|
|
|
26afebd |
set(GMSH_MAN ../../..)
|
|
|
26afebd |
else(WIN32 OR CYGWIN)
|
|
|
26afebd |
- set(GMSH_BIN bin)
|
|
|
26afebd |
- set(GMSH_LIB lib)
|
|
|
26afebd |
+ set(GMSH_BIN bin CACHE INTERNAL "Bin path")
|
|
|
26afebd |
+ set(GMSH_LIB lib${LIB_SUFFIX} CACHE INTERNAL "Lib path")
|
|
|
26afebd |
+ set(GMSH_INCLUDE include CACHE INTERNAL "Include path")
|
|
|
26afebd |
set(GMSH_DOC share/doc/gmsh)
|
|
|
26afebd |
set(GMSH_MAN share/man/man1)
|
|
|
26afebd |
endif(WIN32 OR CYGWIN)
|
|
|
2f3a0d7 |
@@ -1774,10 +1775,11 @@ 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})
|
|
|
8e301b6 |
+ execute_process ( COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
8e301b6 |
+ install(FILES ${ONELAB_PY} DESTINATION ${PYTHON_SITE_PACKAGES})
|
|
|
26afebd |
endif(ENABLE_ONELAB)
|
|
|
26afebd |
if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
|
|
|
26afebd |
- install(FILES ${GMSH_API} DESTINATION include/gmsh)
|
|
|
26afebd |
+ install(FILES ${GMSH_API} DESTINATION ${GMSH_INCLUDE}/gmsh)
|
|
|
26afebd |
endif(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
|
|
|
26afebd |
install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt)
|
|
|
26afebd |
install(FILES ${LICENSE_FILE} DESTINATION ${GMSH_DOC})
|
|
|
2f3a0d7 |
diff -rupN gmsh-3.0.6-source/Common/GmshMessage.cpp gmsh-3.0.6-source-new/Common/GmshMessage.cpp
|
|
|
2f3a0d7 |
--- gmsh-3.0.6-source/Common/GmshMessage.cpp 2017-11-05 13:05:54.000000000 +0100
|
|
|
2f3a0d7 |
+++ gmsh-3.0.6-source-new/Common/GmshMessage.cpp 2017-11-05 16:49:19.361093871 +0100
|
|
|
c9defa2 |
@@ -149,12 +149,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 |
|