diff --git a/cmake/compileroptions/IBM.cmake b/cmake/compileroptions/IBM.cmake
index ca76321c31b16b673f035ee5f9de028daae1ed79..6b6a2617df26a811f7599652d64ea9ebb7e00b52 100644
--- a/cmake/compileroptions/IBM.cmake
+++ b/cmake/compileroptions/IBM.cmake
@@ -9,12 +9,21 @@ add_flag(CMAKE_CXX_FLAGS "-qpic=large")
 
 # Silences compiler and linker warnings and information with the IBM compiler
 add_flag(CMAKE_CXX_FLAGS "-qsuppress=1586-267") # 1586-267 (I) Inlining of
-# specified subprogram failed due to the presence of a C++ exception handler
+                                                # specified subprogram failed
+                                                # due to the presence of a C++
+                                                # exception handler
 add_flag(CMAKE_CXX_FLAGS "-qsuppress=1586-266") # 1586-266 (I) Inlining of
-# specified subprogram failed due to the presence of a global label
+                                                # specified subprogram failed
+                                                # due to the presence of a
+                                                # global label
 add_flag(CMAKE_CXX_FLAGS "-qsuppress=1500-030") # 1500-030: (I) INFORMATION:
-# [...] Additional optimization may be attained by recompiling and specifying
-# MAXMEM option with a value greater than 8192.
-add_flag(CMAKE_C_FLAGS "-qsuppress=1500-030") # 1500-030: (I) INFORMATION:
-# [...] Additional optimization may be attained by recompiling and specifying
-# MAXMEM option with a value greater than 8192.
+                                                # [...] Additional optimization
+                                                # may be attained by recompiling
+                                                # and specifying MAXMEM option
+                                                # with a value greater than
+                                                # 8192.
+add_flag(CMAKE_C_FLAGS "-qsuppress=1500-030") # 1500-030: (I) INFORMATION: [...]
+                                              # Additional optimization may be
+                                              # attained by recompiling and
+                                              # specifying MAXMEM option with a
+                                              # value greater than 8192.
diff --git a/cmake/compileroptions/PGI.cmake b/cmake/compileroptions/PGI.cmake
index 2f2e38078582d6526154248a2ba1a815bbe5cb57..66528dce3d55de955c8a51f35259e96f41204545 100644
--- a/cmake/compileroptions/PGI.cmake
+++ b/cmake/compileroptions/PGI.cmake
@@ -1,4 +1,4 @@
-message(STATUS "Setting Cray specific compiler options")
+message(STATUS "Setting PGI specific compiler options")
 
 # Silences compiler and linker warnings and information with the PGI compiler
 add_flag(CMAKE_CXX_FLAGS "--display_error_number")