Merge release-5-0 into master

Conflicts:
	src/gromacs/CMakeLists.txt (adjacent changes)

Change-Id: I6e5b35508b3f6f6d805a2a539e49decdef28012b

diff --cc cmake/gmxManageSharedLibraries.cmake
Simple merge

diff --cc cmake/gmxTestSimd.cmake
Simple merge

diff --cc src/gromacs/CMakeLists.txt
index 0f8cc721cdfc39d40fa18bd5d89b9d74e9e52f62,6db37e2402e57b5ead038c6f4fe53bdebb24c2f1..912789403df6eeb2ca7239c0d6484427d8e22b3d
--- 1/src/gromacs/CMakeLists.txt
--- 2/src/gromacs/CMakeLists.txt
+++ b/src/gromacs/CMakeLists.txt
@@@ -195,9 -200,10 +195,11 @@@ set_target_properties(libgromacs PROPER
  # for the binary
  if (NOT GMX_BUILD_MDRUN_ONLY OR BUILD_SHARED_LIBS)
      install(TARGETS libgromacs
 -        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 -        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
 -        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
 -        COMPONENT libraries)
 +            EXPORT libgromacs
-             DESTINATION ${LIB_INSTALL_DIR}
++            LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++            RUNTIME DESTINATION ${BIN_INSTALL_DIR}
++            ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
 +            COMPONENT libraries)
  endif()
  
  if (NOT GMX_BUILD_MDRUN_ONLY)

diff --cc src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
Simple merge