Fix CXX/C mismatch of flag/macro for gmxCFlags
authorRoland Schulz <roland@utk.edu>
Mon, 19 Nov 2012 21:44:15 +0000 (16:44 -0500)
committerRoland Schulz <roland@utk.edu>
Tue, 20 Nov 2012 02:18:16 +0000 (21:18 -0500)
Change-Id: Ieb87927e24688a29af284b46be3359bbc57d8891

cmake/gmxCFlags.cmake

index 159014175f76a457808692de49c71d420ecb139f..e84af63ccde7a0560a60d72fd2594752a305d86c 100644 (file)
@@ -56,7 +56,7 @@ MACRO(gmx_c_flags)
     # g++
     if(CMAKE_COMPILER_IS_GNUCXX)
         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 -Wunused-value" GMXC_CXXFLAGS)
         GMX_TEST_CXXFLAG(CXXFLAGS_WARN_EXTRA "-Wextra -Wno-missing-field-initializers -Wno-sign-compare" GMXC_CXXFLAGS)
@@ -80,7 +80,7 @@ MACRO(gmx_c_flags)
             GMX_TEST_CFLAG(CFLAGS_X86 "-mtune=core2" GMXC_CFLAGS_RELEASE)
             GMX_TEST_CFLAG(CFLAGS_IA64 "-mtune=itanium2" GMXC_CFLAGS_RELEASE)
         else()
-            GMX_TEST_CFLAG(CXXFLAGS_WARN "/W2" GMXC_CXXFLAGS)
+            GMX_TEST_CFLAG(CFLAGS_WARN "/W2" GMXC_CFLAGS)
             GMX_TEST_CFLAG(CFLAGS_SSE2 "/arch:SSE2" GMXC_CFLAGS_RELEASE)
             GMX_TEST_CFLAG(CFLAGS_X86 "/Qip" GMXC_CFLAGS_RELEASE)
         endif()
@@ -89,7 +89,7 @@ MACRO(gmx_c_flags)
     if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
         if (NOT WIN32) 
             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" GMXC_CXXFLAGS)
             GMX_TEST_CXXFLAG(CXXFLAGS_OPT "-ip -funroll-all-loops" GMXC_CXXFLAGS_RELEASE)
@@ -124,7 +124,7 @@ MACRO(gmx_c_flags)
     endif()
     if (CMAKE_CXX_COMPILER_ID MATCHES "PathScale")
         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 -Wunused-value" GMXC_CXXFLAGS)
         GMX_TEST_CXXFLAG(CXXFLAGS_OPT "-OPT:Ofast -fno-math-errno -ffast-math"