Merge "Fixes for CMake finding FORTRAN library names on POWER6" into release-4-5...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c52d54c90609d9148d4bb823beee51a2138298c9..b1a73e931c6905e095a0627074607dd1e5f01ecc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -636,13 +636,24 @@ if(GMX_FORTRAN OR GMX_POWER6)
     if(prefix)
       set(prefix "${prefix} ##")
     endif(prefix)
+    if(suffix)
+      set(suffix "## ${suffix}")
+      if(extrasuffix)
+       set(extrasuffix "${suffix}${extrasuffix}")
+      endif(extrasuffix)
+    else(suffix)
+      if(extrasuffix)
+       # Don't know if this is needed, but it can't hurt
+       set(extrasuffix "## ${extrasuffix}")
+      endif(extrasuffix)
+    endif(suffix)
 
     if(isupper)
-        set(F77_FUNCDEF   "${prefix} NAME ## ${suffix}")
-        set(F77_FUNCDEF_  "${prefix} NAME ## ${suffix}${extrasuffix}")
+        set(F77_FUNCDEF   "${prefix} NAME ${suffix}")
+        set(F77_FUNCDEF_  "${prefix} NAME ${extrasuffix}")
     else(isupper)
-        set(F77_FUNCDEF   "${prefix} name ## ${suffix}")
-        set(F77_FUNCDEF_  "${prefix} name ## ${suffix}${extrasuffix}")
+        set(F77_FUNCDEF   "${prefix} name ${suffix}")
+        set(F77_FUNCDEF_  "${prefix} name ${extrasuffix}")
     endif(isupper)
 else(GMX_FORTRAN OR GMX_POWER6)
         set(F77_FUNCDEF   "name ## _")