From: Szilard Pall <pszilard@cbr.su.se>
Date: Wed, 28 Mar 2012 16:18:10 +0000 (+0200)
Subject: Merge branch 'release-4-5-patches' into release-4-6
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=041bdb82cd91f877ed4696d5f6c2b0501c54b3e9;p=alexxy%2Fgromacs.git

Merge branch 'release-4-5-patches' into release-4-6

Change-Id: Id4fc52b784ac55c2e57669af391b8d2a70a56695
---

041bdb82cd91f877ed4696d5f6c2b0501c54b3e9
diff --cc cmake/gmxCFlags.cmake
index 3b9489449f,d7ba7aa7c3..f6dbdb1265
--- a/cmake/gmxCFlags.cmake
+++ b/cmake/gmxCFlags.cmake
@@@ -131,14 -116,14 +131,14 @@@ MACRO(gmx_c_flags
          if(NOT GMX_OPENMP)
              GMX_TEST_CFLAG(CFLAGS_PRAGMA "-Wno-unknown-pragmas" GMXC_CFLAGS)
          endif()
 -        GMX_TEST_CFLAG(CFLAGS_WARN "-Wall -Wno-unused" GMXC_CFLAGS)
 +        GMX_TEST_CFLAG(CFLAGS_WARN "-Wall -Wno-unused -Wunused-value" GMXC_CFLAGS)
      endif()
  
-     if (CMAKE_C_COMPILER_ID MATCHES "Clang")
+     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
          if(NOT GMX_OPENMP)
-             GMX_TEST_CFLAG(CXXFLAGS_PRAGMA "-Wno-unknown-pragmas" GMXC_CXXFLAGS)
+             GMX_TEST_CXXFLAG(CXXFLAGS_PRAGMA "-Wno-unknown-pragmas" GMXC_CXXFLAGS)
          endif()
 -        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "-Wall -Wno-unused" GMXC_CXXFLAGS)
 +        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "-Wall -Wno-unused -Wunused-value" GMXC_CXXFLAGS)
      endif()
  
      # now actually set the flags: