Merge release-5-0 into master

Change-Id: I9813e3770c78f62c9003987b22c0315c89c87485

diff --cc CMakeLists.txt
index c5e2a265041b8c349a4372931a2d97e7ea2b37ab,832dcb44ce5ef6f9de8a6235754ab97c4b47019f..8810d30888ce597373d994f6ce6f8cf0b1b1943e
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -103,11 -103,7 +103,8 @@@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_
      set(CMAKE_INSTALL_PREFIX "/usr/local/gromacs" CACHE STRING "Installation prefix (installation will need write permissions here)" FORCE)
  endif()
  
- set(GMX_INSTALL_PREFIX "" CACHE STRING "Prefix gets appended to CMAKE_INSTALL_PREFIX. For cpack it sets the root folder of the archive.")
- mark_as_advanced(GMX_INSTALL_PREFIX)
- 
  include(gmxBuildTypeReference)
 +include(gmxBuildTypeProfile)
  include(gmxBuildTypeTSAN)
  include(gmxBuildTypeASAN)
  include(gmxBuildTypeReleaseWithAssert)

diff --cc src/gromacs/CMakeLists.txt
Simple merge

diff --cc src/gromacs/gmxlib/CMakeLists.txt
Simple merge

diff --cc src/gromacs/selection/parsetree.cpp
Simple merge

diff --cc src/gromacs/selection/selectioncollection.cpp
Simple merge

diff --cc src/gromacs/selection/selelem.h
Simple merge

diff --cc src/gromacs/selection/selmethod.h
Simple merge

diff --cc src/gromacs/selection/tests/selectioncollection.cpp
Simple merge