From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Thu, 9 Apr 2015 08:41:01 +0000 (+0200)
Subject: Merge branch release-5-0
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=168a647b1f9f67ba8532fd50c9698701ffede6e3;p=alexxy%2Fgromacs.git

Merge branch release-5-0

Change-Id: Ice890f6d9b0235bc2f07e5c73ee2264a32f18a86
---

168a647b1f9f67ba8532fd50c9698701ffede6e3
diff --cc CMakeLists.txt
index abc899722e,4a2650bb7d..79e7f1ef2f
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -513,13 -613,12 +517,6 @@@ if (GMX_BUILD_UNITTESTS AND NOT HAVE_LI
          "Either set GMX_BUILD_UNITTESTS=OFF or tell CMake how to find a working version of libxml2.")
  endif()
  
- if(GMX_USE_TNG AND NOT GMX_EXTERNAL_TNG)
-     # TNG wants zlib if it is available
-     find_package(ZLIB QUIET)
-     include(gmxTestZLib)
-     gmx_test_zlib(HAVE_ZLIB)
- endif()
 -########################################################################
 -# Generate development version info for cache
 -########################################################################
 -# set(GEN_VERSION_INFO_INTERNAL "ON")
 -# include(gmxGenerateVersionString)
--
  ########################################################################
  # Our own GROMACS tests
  ########################################################################