From: Teemu Murtola <teemu.murtola@gmail.com>
Date: Sat, 5 Jul 2014 16:14:21 +0000 (+0300)
Subject: Merge release-5-0 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=da2c526f7883bd6c37de995c37bc80d1f0771681;p=alexxy%2Fgromacs.git

Merge release-5-0 into master

Change-Id: I9813e3770c78f62c9003987b22c0315c89c87485
---

da2c526f7883bd6c37de995c37bc80d1f0771681
diff --cc CMakeLists.txt
index c5e2a26504,832dcb44ce..8810d30888
--- a/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)