Merge branch release-5-1 into release-2016
Conflicts:
CMakeLists.txt
Adjacent unrelated changes, trivial resolution
cmake/gmxDetectSimd.cmake
Two unrelated fixes, managing the new GMX_STDLIB_LIBRARIES better, and
working around the fact that we can't use try_run with noisy
compilers. The new context invalidates the suggestion to use try_run
once we require CMake 2.8.11.
cmake/gmxSetBuildInformation.cmake
As above.
src/gromacs/commandline/filenm.h
Adjacent changes caused by introducing Doxygen
src/gromacs/fileio/filetypes.cpp
As above
src/gromacs/legacyheaders/force.h
Change to function signature to pass const char *fn.
src/gromacs/mdlib/forcerec.cpp
Minor clashes from reorganized include files.
TODO make_bonded_tables was refactored in release-5-1 to need
t_filenm, which reintroduces a dependency on
commandline/filenm.h. Decide what to do about this.
src/gromacs/mdlib/mdatoms.cpp
git was confused about the frozen-atom fix because of the indenting
change, but the merge is straightforward in terms of code logic.
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
New Doxygen in release-2016 clashed with introducing support for CUDA
6.0/6.1.
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh
As above
src/gromacs/tables/forcetable.cpp
Change to function signature to pass const char *fn.
src/programs/mdrun/tests/CMakeLists.txt
Adjacent new files introduceed in both branches
Change-Id: Iaaffacc186aa5ff67c83522d2c07b05afeec75b2
21 files changed: