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

[alexxy/gromacs.git] / cmake / gmxCFlags.cmake

diff --git a/cmake/gmxCFlags.cmake b/cmake/gmxCFlags.cmake
index 061607f19048d1e1e77be40c4c5d47159f6a4b20..159014175f76a457808692de49c71d420ecb139f 100644 (file)
--- a/cmake/gmxCFlags.cmake
+++ b/cmake/gmxCFlags.cmake
@@ -137,7 +137,7 @@ MACRO(gmx_c_flags)
         GMX_TEST_CFLAG(CFLAGS_LANG "-qlanglvl=extc99" GMXC_CFLAGS)
     endif()
     if (CMAKE_CXX_COMPILER_ID MATCHES "XL")
-        GMX_TEST_CXXFLAG(CFLAGS_OPT "-qarch=auto -qtune=auto" GMXC_CXXFLAGS)
+        GMX_TEST_CXXFLAG(CXXFLAGS_OPT "-qarch=auto -qtune=auto" GMXC_CXXFLAGS)
     endif()
 
     #msvc
@@ -145,7 +145,7 @@ MACRO(gmx_c_flags)
         # disable warnings for: 
         #      inconsistent dll linkage
         GMX_TEST_CFLAG(CFLAGS_WARN "/wd4273" GMXC_CFLAGS)
-        GMX_TEST_CFLAG(CXXFLAGS_WARN "/wd4273" GMXC_CXXFLAGS)
+        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "/wd4273" GMXC_CXXFLAGS)
     endif()
 
     if (CMAKE_C_COMPILER_ID MATCHES "Clang")