path: root/doc.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 515cc11ca..26804389c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,9 +53,26 @@
 #  SUITESPARSEPATH: define this variable with the path to a custom suitesparse install
 #  PYTHON_VERSION: force python version to the given one, set -1 to automatically use the last version on the system. (-1 by default)
 #  DISABLE_PKGS : comma-separated list of disabled packages from 'pkg', 'preprocessing' or 'postprocessing', if empty all packages will be built.The packages `common` and `dem` are required to run, but the project can be compiled without them. (EMPTY by default)
-
-project(Yade C CXX)
 cmake_minimum_required(VERSION 3.5.0)
+project(Yade C CXX)
+if(POLICY CMP0072)
+# FindOpenGL prefers GLVND by default when available.
+# https://cmake.org/cmake/help/latest/policy/CMP0072.html
+  cmake_policy(SET CMP0072 NEW)
+endif()
+if(POLICY CMP0095)
+# RPATH entries are properly escaped in the intermediary CMake install script.
+# https://cmake.org/cmake/help/latest/policy/CMP0095.html
+
+  cmake_policy(SET CMP0095 NEW)
+endif()
+
+if(POLICY CMP0167)
+# The FindBoost module is removed.
+# https://cmake.org/cmake/help/latest/policy/CMP0167.html
+
+  cmake_policy(SET CMP0167 NEW)
+endif()
 IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
   set (CMAKE_CXX_STANDARD 14)
 ELSE()
@@ -813,7 +830,6 @@ ENDIF((Boost_MAJOR_VERSION EQUAL 1) OR (Boost_MAJOR_VERSION GREATER 1) AND
 IF(ENABLE_VTK)
   SET(VTK_VERSIONS 9 8.2 8.1 6)
   SET(VTK_COMPONENTS IOParallelXML CommonCore IOImage IOXML FiltersCore ImagingCore RenderingCore ImagingGeneral ImagingHybrid FiltersGeneral FiltersSources)
-
   MESSAGE(STATUS "Checking supported libvtk versions: ${VTK_VERSIONS}")
   FOREACH(vtk_ver ${VTK_VERSIONS})
 	IF(${vtk_ver} EQUAL 9)
@@ -823,7 +839,6 @@ IF(ENABLE_VTK)
    		FOREACH(comp ${VTK_COMPONENTS})
       			LIST(APPEND PRE_9_VTK_COMPONENTS "vtk${comp}")
    		ENDFOREACH()
-
 		FIND_PACKAGE(VTK ${vtk_ver} QUIET COMPONENTS ${PRE_9_VTK_COMPONENTS})
 	ENDIF()

@@ -831,7 +846,6 @@ IF(ENABLE_VTK)
 		BREAK()
 	ENDIF()
   ENDFOREACH()
-
   IF(VTK_FOUND)
     INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
     LINK_DIRECTORIES( ${VTK_LIBRARY_DIRS} )
@@ -989,12 +1003,21 @@ IF(ENABLE_PFVFLOW AND ENABLE_LINSOLV)
   ENDIF(DEFINED SUITESPARSEPATH)
   FIND_PACKAGE(Cholmod)
   FIND_PACKAGE(OpenBlas)
+  IF((SUITESPARSE_MAIN_VERSION GREATER 6) OR (SUITESPARSE_MAIN_VERSION EQUAL 6))
+  SET(INTEGRATED_METIS TRUE)
+  SET(METIS_INCLUDE_DIR "")
+  SET(METIS_LIBRARY "${CHOLMOD_LIBRARIES}")
+  ELSE((SUITESPARSE_MAIN_VERSION GREATER 6) OR (SUITESPARSE_MAIN_VERSION EQUAL 6))
   FIND_PACKAGE(Metis)
+  ENDIF((SUITESPARSE_MAIN_VERSION GREATER 6) OR (SUITESPARSE_MAIN_VERSION EQUAL 6))

-  IF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND AND CGAL_FOUND)
+  IF(CHOLMOD_FOUND AND OPENBLAS_FOUND  AND CGAL_FOUND)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CGAL_DEFINITIONS} -DLINSOLV")

-    SET(LINKLIBS  "${LINKLIBS};${CHOLMOD_LIBRARIES};${AMD_LIBRARY};${CAMD_LIBRARY};${COLAMD_LIBRARY};${CCOLAMD_LIBRARY};${OPENBLAS_LIBRARY};${METIS_LIBRARY};${SUITESPARSE_LIBRARY};${SUITESPARSECONFIG_LIBRARY}")
+    SET(LINKLIBS  "${LINKLIBS};${CHOLMOD_LIBRARIES};${AMD_LIBRARY};${CAMD_LIBRARY};${COLAMD_LIBRARY};${CCOLAMD_LIBRARY};${OPENBLAS_LIBRARY};${SUITESPARSE_LIBRARY};${SUITESPARSECONFIG_LIBRARY}")
+    IF (NOT INTEGRATED_METIS)
+    SET(LINKLIBS "${LINKLIBS};${METIS_LIBRARY}")
+    ENDIF(NOT INTEGRATED_METIS)
     INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIR} ${CHOLMOD_INCLUDE_DIR} ${BLAS_INCLUDE_DIR})
     MESSAGE(STATUS "Found Cholmod in " ${CHOLMOD_LIBRARIES})
     MESSAGE(STATUS "Found OpenBlas in " ${OPENBLAS_LIBRARY})
@@ -1019,11 +1042,11 @@ IF(ENABLE_PFVFLOW AND ENABLE_LINSOLV)
       SET(DISABLED_FEATS "${DISABLED_FEATS} CHOLMOD_GPU")
     ENDIF(CHOLMOD_GPU)

-  ELSE(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND AND CGAL_FOUND)
+  ELSE(CHOLMOD_FOUND AND OPENBLAS_FOUND AND CGAL_FOUND)
     MESSAGE(STATUS "Missing dependency for LINSOLV, disabled")
     SET(DISABLED_FEATS "${DISABLED_FEATS} LINSOLV")
     SET(ENABLE_LINSOLV OFF)
-  ENDIF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND AND CGAL_FOUND)
+  ENDIF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND CGAL_FOUND)
 ELSE(ENABLE_PFVFLOW AND ENABLE_LINSOLV)
   SET(DISABLED_FEATS "${DISABLED_FEATS} LINSOLV")
       IF(ENABLE_TWOPHASEFLOW)
@@ -1276,13 +1299,18 @@ MESSAGE (STATUS "runtimePREFIX is set to " ${runtimePREFIX})
 SET(YADE_LIB_PATH ${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}/yade${SUFFIX})
 SET(YADE_EXEC_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})
 SET(YADE_PY_PATH ${YADE_LIB_PATH}/py)
+IF (NOT YADE_EXEC_BIN)
+SET(YADE_EXEC_BIN ${YADE_EXEC_PATH}/yade${SUFFIX} )
+ENDIF(NOT YADE_EXEC_BIN)
+IF (NOT YADE_DOC_PATH)
 SET(YADE_DOC_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/doc/yade${SUFFIX})
+ENDIF (NOT YADE_DOC_PATH)
+IF (NOT YADE_MAN_PATH)
 SET(YADE_MAN_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_MANDIR})
-
+ENDIF (NOT YADE_MAN_PATH)

 SET(CMAKE_SKIP_BUILD_RPATH FALSE)
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-SET(CMAKE_INSTALL_RPATH "${YADE_LIB_PATH};${YADE_PY_PATH};${YADE_PY_PATH}/yade/;${YADE_PY_PATH}/yade/qt;${YADE_PY_PATH}/gts")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

 #===========================================================
@@ -1317,6 +1345,7 @@ ENDIF(ENABLE_POTENTIAL_PARTICLES OR ENABLE_POTENTIAL_BLOCKS OR ENABLE_LS_DEM)
 # boot is linked to nearly evey other *.so and should be loaded first
 ADD_LIBRARY(boot SHARED ${CMAKE_CURRENT_SOURCE_DIR}/core/main/pyboot.cpp)
 SET_TARGET_PROPERTIES(boot PROPERTIES PREFIX "" LINK_FLAGS "-Wl,--no-as-needed" )
+SET_TARGET_PROPERTIES(boot PROPERTIES INSTALL_RPATH "$ORIGIN/../..;$ORIGIN/qt")
 TARGET_LINK_LIBRARIES(boot ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${LINKLIBS} ${VTK_LIBRARIES} -lrt)

 # this is /core and /lib
@@ -1504,7 +1533,10 @@ IF(ENABLE_OAR)
   INSTALL(PROGRAMS "${CMAKE_BINARY_DIR}/bins/yade${SUFFIX}-oar" DESTINATION ${YADE_EXEC_PATH}/)
 ENDIF(ENABLE_OAR)
 INSTALL(PROGRAMS "${CMAKE_BINARY_DIR}/bins/yade${SUFFIX}" DESTINATION ${YADE_EXEC_PATH}/)
-INSTALL(CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${YADE_EXEC_PATH}/yade${SUFFIX} ${YADE_EXEC_PATH}/yade${SUFFIX}.py)")
+IF(NOT NOSUFFIX)
+# yade.py with no suffix breaks import
+INSTALL(CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink yade${SUFFIX} \$ENV{DESTDIR}/${YADE_EXEC_PATH}/yade${SUFFIX}.py)")
+ENDIF(NOT NOSUFFIX)
 INSTALL(FILES "${CMAKE_BINARY_DIR}/config.py" DESTINATION ${YADE_PY_PATH}/yade/)
 INSTALL(FILES "${CMAKE_BINARY_DIR}/libVersions.py" DESTINATION ${YADE_PY_PATH}/yade/)
 INSTALL(FILES "${CMAKE_BINARY_DIR}/__init__.py" DESTINATION ${YADE_PY_PATH}/yade/)
@@ -1566,19 +1598,19 @@ ADD_CUSTOM_COMMAND(
                   TARGET doc PRE_BUILD
                   COMMAND rm -rf ${CMAKE_BINARY_DIR}/doc/sphinx/_build
                   COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/doc/* ${CMAKE_BINARY_DIR}/doc
-                  COMMAND PYTHONPATH=${CMAKE_BINARY_DIR}/doc/sphinx ${YADE_EXEC_PATH}/yade${SUFFIX} -x yadeSphinx.py html
-                  COMMAND PYTHONPATH=${CMAKE_BINARY_DIR}/doc/sphinx ${YADE_EXEC_PATH}/yade${SUFFIX} -x yadeSphinx.py latex
-                  COMMAND PYTHONPATH=${CMAKE_BINARY_DIR}/doc/sphinx ${YADE_EXEC_PATH}/yade${SUFFIX} -x yadeSphinx.py epub
-                  COMMAND PYTHONPATH=${CMAKE_BINARY_DIR}/doc/sphinx ${YADE_EXEC_PATH}/yade${SUFFIX} -x yadeSphinx.py workarounds
+                  COMMAND PYTHONPATH=${CMAKE_BINARY_DIR}/doc/sphinx ${YADE_EXEC_BIN} -x yadeSphinx.py html
+                  COMMAND PYTHONPATH=${CMAKE_BINARY_DIR}/doc/sphinx ${YADE_EXEC_BIN} -x yadeSphinx.py latex
+                  COMMAND PYTHONPATH=${CMAKE_BINARY_DIR}/doc/sphinx ${YADE_EXEC_BIN} -x yadeSphinx.py epub
+                  COMMAND PYTHONPATH=${CMAKE_BINARY_DIR}/doc/sphinx ${YADE_EXEC_BIN} -x yadeSphinx.py workarounds
                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc/sphinx
-                  DEPENDS ${YADE_EXEC_PATH}/yade${SUFFIX}
+                  DEPENDS ${YADE_EXEC_BIN}
                   )
 ADD_CUSTOM_COMMAND(
                   TARGET doc POST_BUILD
                   COMMAND xelatex Yade.tex
                   COMMAND xelatex Yade.tex
                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc/sphinx/_build/latex
-                  DEPENDS ${YADE_EXEC_PATH}/yade${SUFFIX} ${CMAKE_BINARY_DIR}/doc/sphinx/_build/latex/Yade.tex
+                  DEPENDS ${YADE_EXEC_BIN} ${CMAKE_BINARY_DIR}/doc/sphinx/_build/latex/Yade.tex
                   )
 ADD_CUSTOM_COMMAND(
                   TARGET doc POST_BUILD
@@ -1586,34 +1618,34 @@ ADD_CUSTOM_COMMAND(
                   COMMAND mv ${CMAKE_BINARY_DIR}/doc/sphinx/_build/html ${YADE_DOC_PATH}/html
                   COMMAND mv ${CMAKE_BINARY_DIR}/doc/sphinx/_build/latex/Yade.pdf ${YADE_DOC_PATH}/
                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc/sphinx/_build/latex
-                  DEPENDS ${YADE_EXEC_PATH}/yade${SUFFIX} ${CMAKE_BINARY_DIR}/doc/sphinx/_build/latex/Yade.tex
+                  DEPENDS ${YADE_EXEC_BIN} ${CMAKE_BINARY_DIR}/doc/sphinx/_build/latex/Yade.tex
                   )
 ADD_CUSTOM_COMMAND(
                   TARGET doc POST_BUILD
                   COMMAND mv ${CMAKE_BINARY_DIR}/doc/sphinx/_build/epub/Yade.epub ${YADE_DOC_PATH}/ || true
                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc/sphinx/_build/latex
-                  DEPENDS ${YADE_EXEC_PATH}/yade${SUFFIX} ${CMAKE_BINARY_DIR}/doc/sphinx/_build/latex/Yade.tex
+                  DEPENDS ${YADE_EXEC_BIN} ${CMAKE_BINARY_DIR}/doc/sphinx/_build/latex/Yade.tex
                   )
 #===========================================================
 #Building manpage
 ADD_CUSTOM_TARGET(manpage)
 ADD_CUSTOM_COMMAND(
                   TARGET manpage POST_BUILD
-                  COMMAND help2man ${YADE_EXEC_PATH}/yade${SUFFIX} > yade${SUFFIX}.1
-                  COMMAND help2man ${YADE_EXEC_PATH}/yade${SUFFIX}-batch > yade${SUFFIX}-batch.1
+                  COMMAND help2man ${YADE_EXEC_BIN} > yade${SUFFIX}.1
+                  COMMAND help2man ${YADE_EXEC_BIN}-batch > yade${SUFFIX}-batch.1
                   COMMAND mkdir -p ${YADE_MAN_PATH}
                   COMMAND mv *.1 ${YADE_MAN_PATH}
                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                  DEPENDS ${YADE_EXEC_PATH}/yade${SUFFIX} /usr/bin/help2man
+                  DEPENDS ${YADE_EXEC_BIN} /usr/bin/help2man
                   )
 #===========================================================
 #Execute standard checks
 ADD_CUSTOM_TARGET(check)
 ADD_CUSTOM_COMMAND(
                   TARGET check POST_BUILD
-                  COMMAND ${YADE_EXEC_PATH}/yade${SUFFIX} --test
-                  COMMAND ${YADE_EXEC_PATH}/yade${SUFFIX} --check
+                  COMMAND ${YADE_EXEC_BIN} --test
+                  COMMAND ${YADE_EXEC_BIN} --check
                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                  DEPENDS ${YADE_EXEC_PATH}/yade${SUFFIX}
+                  DEPENDS ${YADE_EXEC_BIN}
                   )
 #===========================================================
diff --git a/cMake/FindFreeGlut.cmake b/cMake/FindFreeGlut.cmake
index ac6c0541c..e0ad25750 100644
--- a/cMake/FindFreeGlut.cmake
+++ b/cMake/FindFreeGlut.cmake
@@ -11,6 +11,6 @@ FIND_LIBRARY(FREEGLUT_LIBRARY NAMES glut)
 # handle the QUIETLY and REQUIRED arguments and set FREEGLUT_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FREEGLUT  DEFAULT_MSG  FREEGLUT_INCLUDE_DIR FREEGLUT_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(FreeGlut  DEFAULT_MSG  FREEGLUT_INCLUDE_DIR FREEGLUT_LIBRARY)

 MARK_AS_ADVANCED(FREEGLUT_INCLUDE_DIR FREEGLUT_LIBRARY)
diff --git a/cMake/FindGTS.cmake b/cMake/FindGTS.cmake
index 5c93b39d3..af9580a41 100644
--- a/cMake/FindGTS.cmake
+++ b/cMake/FindGTS.cmake
@@ -89,15 +89,17 @@ ELSE(WIN32)

       MESSAGE(STATUS "GTS using gts-config ${GTS_CONFIG}")
       # set CXXFLAGS to be fed into CXX_FLAGS by the user:
-      EXEC_PROGRAM(${GTS_CONFIG}
-        ARGS --cflags
-        OUTPUT_VARIABLE  GTS_CXX_FLAGS )
+      EXECUTE_PROCESS(
+        COMMAND ${GTS_CONFIG} --cflags
+        OUTPUT_VARIABLE  GTS_CXX_FLAGS
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
        #SET(GTS_CXX_FLAGS "`${GTS_CONFIG} --cflags`")
       SET(CMAKE_GTS_CXX_FLAGS ${GTS_CXX_FLAGS})
       #      MESSAGE("DBG ${GTS_CXX_FLAGS}")
       # set INCLUDE_DIRS to prefix+include
-      EXEC_PROGRAM(${GTS_CONFIG}
-        ARGS --prefix
+      EXECUTE_PROCESS(
+        COMMAND ${GTS_CONFIG} --prefix
         OUTPUT_VARIABLE GTS_PREFIX)
       SET(GTS_INCLUDE_DIR ${GTS_PREFIX}/include CACHE STRING INTERNAL)
       # set link libraries and link flags
@@ -105,8 +107,8 @@ ELSE(WIN32)
       #SET(GSL_LIBRARIES "`${GSL_CONFIG} --libs`")

       # extract link dirs for rpath
-      EXEC_PROGRAM(${GTS_CONFIG}
-        ARGS --libs
+      EXECUTE_PROCESS(
+        COMMAND ${GTS_CONFIG} --libs
         OUTPUT_VARIABLE  GTS_CONFIG_LIBS )
       SET(GTS_LIBRARIES "${GTS_CONFIG_LIBS}")

diff --git a/cMake/Findglib2.cmake b/cMake/Findglib2.cmake
index 52b338202..12b995705 100644
--- a/cMake/Findglib2.cmake
+++ b/cMake/Findglib2.cmake
@@ -27,7 +27,7 @@ IF (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS )
   SET(GLIB2_FOUND TRUE)
 ELSE (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS )

-  INCLUDE(FindPkgConfig)
+find_package(PkgConfig QUIET)

   ## Glib
   IF ( GLIB2_FIND_REQUIRED )
diff --git a/cMake/GetVersion.cmake b/cMake/GetVersion.cmake
index 0bc725468..2285d2109 100644
--- a/cMake/GetVersion.cmake
+++ b/cMake/GetVersion.cmake
@@ -4,68 +4,48 @@ IF (NOT YADE_VERSION)
   IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/RELEASE )
     #Release file is found
     SET(READFILE cat)
-    exec_program(
-      ${READFILE}
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      ARGS "RELEASE"
+    execute_process(
+      COMMAND ${READFILE} "RELEASE"
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       OUTPUT_VARIABLE YADE_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE
     )
   ELSEIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
     #Use git for version defining
-    exec_program(
-      "git"
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      ARGS "log"
-      ARGS "-n1"
-      ARGS "--pretty=oneline"
-      ARGS "|"
-      ARGS "cut"
-      ARGS "-c1-7"
+    execute_process(
+      COMMAND git log -n1 --pretty=oneline
+      COMMAND cut -c1-7
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       OUTPUT_VARIABLE VERSION_GIT
+      OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    exec_program(
-      "git"
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      ARGS "log"
-      ARGS "-n1"
-      ARGS "--pretty=fuller"
-      ARGS "--date=iso"
-      ARGS "|"
-      ARGS "grep"
-      ARGS "AuthorDate"
-      ARGS "|"
-      ARGS "cut"
-      ARGS "-c13-22"
+    execute_process(
+      COMMAND git log -n1 --pretty=fuller --date=iso
+      COMMAND grep AuthorDate
+      COMMAND cut -c13-22
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       OUTPUT_VARIABLE VERSION_DATE
+      OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     SET(YADE_VERSION "${VERSION_DATE}.git-${VERSION_GIT}")

     #git log -n1 --pretty=format:"%ai_%h"
   ELSEIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.bzr/branch/last-revision)
     #Use bzr for version defining
-    exec_program(
-      "less"
-      ${CMAKE_CURRENT_SOURCE_DIR}/.bzr/branch/
-      ARGS "last-revision"
-      ARGS "|"
-      ARGS "cut"
-      ARGS "-c13-20"
+    execute_process(
+      COMMAND less last-revision
+      COMMAND cut -c13-20
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/.bzr/branch/
       OUTPUT_VARIABLE VERSION_GIT
+      OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    exec_program(
-      "bzr"
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      ARGS "log"
-      ARGS "-l"
-      ARGS "1"
-      ARGS "--gnu-changelog"
-      ARGS "|"
-      ARGS "head"
-      ARGS "-n1"
-      ARGS "|"
-      ARGS "cut"
-      ARGS "-c1-10"
+    execute_process(
+      COMMAND bzr log -l 1 --gnu-changelog
+      COMMAND head -n 1
+      COMMAND cut -c1-10
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       OUTPUT_VARIABLE VERSION_DATE
+      OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     SET(YADE_VERSION "${VERSION_DATE}.git-${VERSION_GIT}")
   ELSE (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git )
diff --git a/py/CMakeLists.txt b/py/CMakeLists.txt
index a600a5a45..f38677c96 100644
--- a/py/CMakeLists.txt
+++ b/py/CMakeLists.txt
@@ -65,6 +65,7 @@ INSTALL(TARGETS _polyhedra_utils DESTINATION "${YADE_PY_PATH}/yade/")

 ADD_LIBRARY(_packPredicates SHARED "${CMAKE_CURRENT_SOURCE_DIR}/pack/_packPredicates.cpp")
 SET_TARGET_PROPERTIES(_packPredicates PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES(_packPredicates PROPERTIES INSTALL_RPATH "$ORIGIN/../gts")
 IF(ENABLE_GTS AND NOT(PY_gts))
   TARGET_LINK_LIBRARIES(_packPredicates _gts)
 ENDIF(ENABLE_GTS AND NOT(PY_gts))
@@ -102,4 +103,3 @@ IF(ENABLE_LOGGER AND CMAKE_UNITY_BUILD)
 		SET_PROPERTY(SOURCE ${CPP_LOGGER_USED_HERE} PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
 	ENDFOREACH(CPP_LOGGER_USED_HERE)
 ENDIF(ENABLE_LOGGER AND CMAKE_UNITY_BUILD)
-
diff --git a/py/_libVersions.cpp b/py/_libVersions.cpp
index e4bb22f16..d435e3040 100644
--- a/py/_libVersions.cpp
+++ b/py/_libVersions.cpp
@@ -243,7 +243,14 @@ py::list openblasVer() { return {}; }

 #if defined(LINSOLV) || defined(FLOW_ENGINE)
 // 16. metis
+#if SUITESPARSE_MAIN_VERSION >= 6
+#include <cholmod.h>
+#define METIS_VER_MAJOR CHOLMOD_MAIN_VERSION
+#define METIS_VER_MINOR CHOLMOD_SUB_VERSION
+#define MTMETIS_VER_SUBMINOR CHOLMOD_SUBSUB_VERSION
+#else
 #include <metis.h>
+#endif
 py::list metisVer()
 {
 	py::list ret;