|
 |
582ee87 |
diff -rupN gmsh-2.10.1-source/CMakeLists.txt gmsh-2.10.1-source-new/CMakeLists.txt
|
|
|
582ee87 |
--- gmsh-2.10.1-source/CMakeLists.txt 2015-08-08 01:41:33.000000000 +0200
|
|
|
582ee87 |
+++ gmsh-2.10.1-source-new/CMakeLists.txt 2015-08-08 01:54:07.257086642 +0200
|
|
|
582ee87 |
@@ -1582,8 +1582,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)
|
|
|
582ee87 |
@@ -1633,10 +1634,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})
|
|
|
582ee87 |
diff -rupN gmsh-2.10.1-source/Common/GmshMessage.cpp gmsh-2.10.1-source-new/Common/GmshMessage.cpp
|
|
|
582ee87 |
--- gmsh-2.10.1-source/Common/GmshMessage.cpp 2015-07-30 22:12:09.000000000 +0200
|
|
|
582ee87 |
+++ gmsh-2.10.1-source-new/Common/GmshMessage.cpp 2015-08-08 01:54:07.258086662 +0200
|
|
|
335d05d |
@@ -157,12 +157,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 |
|