Skip to content

Commit

Permalink
compileroptions.cmake: moved GNU-specifc options out of shared scoped
Browse files Browse the repository at this point in the history
  • Loading branch information
@firewave
firewave committed Nov 25, 2024
1 parent 796d5b5 commit f531f5d
Show file tree
Hide file tree
Showing 15 changed files with 286 additions and 283 deletions.
9 changes: 6 additions & 3 deletions cmake/compileroptions.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
if(WARNINGS_ARE_ERRORS)
add_compile_options(-Werror)
endif()
add_compile_options(-pedantic)
add_compile_options(-pedantic) # TODO: is this implied by -Weverything?
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
add_compile_options(-Wall)
add_compile_options(-Wextra)
add_compile_options(-Wcast-qual) # Cast for removing type qualifiers
Expand All @@ -57,9 +60,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
#add_compile_options(-Wsign-conversion) # too many warnings
#add_compile_options(-Wunreachable-code) # some GCC versions report lots of warnings
#add_compile_options(-Wsign-promo)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# use pipes instead of temporary files - greatly reduces I/O usage
add_compile_options(-pipe)

Expand Down Expand Up @@ -121,6 +122,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options_safe(-Wno-date-time)
add_compile_options(-Wno-disabled-macro-expansion)
add_compile_options_safe(-Wno-bitwise-instead-of-logical)
add_compile_options(-Wno-sign-compare)

# these cannot be fixed properly without adopting later C++ standards
add_compile_options_safe(-Wno-unsafe-buffer-usage)
Expand All @@ -143,6 +145,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# warnings we are currently not interested in
add_compile_options(-Wno-four-char-constants)
add_compile_options(-Wno-weak-vtables)
add_compile_options(-Wno-multichar)

if(ENABLE_COVERAGE OR ENABLE_COVERAGE_XML)
message(FATAL_ERROR "Do not use clang to generate code coverage. Use GCC instead.")
Expand Down
40 changes: 20 additions & 20 deletions gui/cppcheck_de.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,7 @@ Options:
<translation>Symbolname</translation>
</message>
<message>
<location filename="newsuppressiondialog.cpp" line="82"/>
<location filename="newsuppressiondialog.cpp" line="81"/>
<source>Edit suppression</source>
<translation>Fehlerunterdrückung bearbeiten</translation>
</message>
Expand Down Expand Up @@ -2347,27 +2347,27 @@ Options:
<translation>Undefinierte Datei</translation>
</message>
<message>
<location filename="resultstree.cpp" line="867"/>
<location filename="resultstree.cpp" line="865"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
<location filename="resultstree.cpp" line="1060"/>
<location filename="resultstree.cpp" line="1058"/>
<source>Could not find file:</source>
<translation>Kann Datei nicht finden:</translation>
</message>
<message>
<location filename="resultstree.cpp" line="1064"/>
<location filename="resultstree.cpp" line="1062"/>
<source>Please select the folder &apos;%1&apos;</source>
<translation>Bitte wählen Sie den Ordner &apos;%1&apos;</translation>
</message>
<message>
<location filename="resultstree.cpp" line="1065"/>
<location filename="resultstree.cpp" line="1063"/>
<source>Select Directory &apos;%1&apos;</source>
<translation>Wähle Verzeichnis &apos;%1&apos;</translation>
</message>
<message>
<location filename="resultstree.cpp" line="1067"/>
<location filename="resultstree.cpp" line="1065"/>
<source>Please select the directory where file is located.</source>
<translation>Bitte wählen Sie das Verzeichnis, wo sich die Datei befindet</translation>
</message>
Expand All @@ -2382,27 +2382,27 @@ Options:
<translation>Anmerkung</translation>
</message>
<message>
<location filename="resultstree.cpp" line="866"/>
<location filename="resultstree.cpp" line="864"/>
<source>Recheck</source>
<translation>Erneut prüfen</translation>
</message>
<message>
<location filename="resultstree.cpp" line="868"/>
<location filename="resultstree.cpp" line="866"/>
<source>Hide</source>
<translation>Verstecken</translation>
</message>
<message>
<location filename="resultstree.cpp" line="869"/>
<location filename="resultstree.cpp" line="867"/>
<source>Hide all with id</source>
<translation>Verstecke alle mit gleicher ID</translation>
</message>
<message>
<location filename="resultstree.cpp" line="888"/>
<location filename="resultstree.cpp" line="886"/>
<source>Suppress selected id(s)</source>
<translation>Ausgewählte ID(s) unterdrücken</translation>
</message>
<message>
<location filename="resultstree.cpp" line="870"/>
<location filename="resultstree.cpp" line="868"/>
<source>Open containing folder</source>
<translation>Übergeordneten Ordner öffnen</translation>
</message>
Expand All @@ -2412,23 +2412,23 @@ Options:
<translation type="unfinished"></translation>
</message>
<message>
<location filename="resultstree.cpp" line="909"/>
<location filename="resultstree.cpp" line="907"/>
<source>Tag</source>
<translation>Tag</translation>
</message>
<message>
<location filename="resultstree.cpp" line="911"/>
<location filename="resultstree.cpp" line="909"/>
<source>No tag</source>
<translation>Kein Tag</translation>
</message>
<message>
<location filename="resultstree.cpp" line="942"/>
<location filename="resultstree.cpp" line="956"/>
<location filename="resultstree.cpp" line="940"/>
<location filename="resultstree.cpp" line="954"/>
<source>Cppcheck</source>
<translation>Cppcheck</translation>
</message>
<message>
<location filename="resultstree.cpp" line="943"/>
<location filename="resultstree.cpp" line="941"/>
<source>No editor application configured.

Configure the editor application for Cppcheck in preferences/Applications.</source>
Expand All @@ -2437,7 +2437,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
Konfigurieren Sie diese unter Einstellungen/Anwendungen.</translation>
</message>
<message>
<location filename="resultstree.cpp" line="957"/>
<location filename="resultstree.cpp" line="955"/>
<source>No default editor application selected.

Please select the default editor application in preferences/Applications.</source>
Expand All @@ -2446,12 +2446,12 @@ Please select the default editor application in preferences/Applications.</sourc
Bitte wählen Sie eine Standardanwendung unter Einstellungen/Anwendungen.</translation>
</message>
<message>
<location filename="resultstree.cpp" line="983"/>
<location filename="resultstree.cpp" line="981"/>
<source>Could not find the file!</source>
<translation>Datei konnte nicht gefunden werden!</translation>
</message>
<message>
<location filename="resultstree.cpp" line="1046"/>
<location filename="resultstree.cpp" line="1044"/>
<source>Could not start %1

Please check the application path and parameters are correct.</source>
Expand All @@ -2460,7 +2460,7 @@ Please check the application path and parameters are correct.</source>
Bitte überprüfen Sie ob der Pfad und die Parameter der Anwendung richtig eingestellt sind.</translation>
</message>
<message>
<location filename="resultstree.cpp" line="1068"/>
<location filename="resultstree.cpp" line="1066"/>
<source>Select Directory</source>
<translation>Wähle Verzeichnis</translation>
</message>
Expand Down
40 changes: 20 additions & 20 deletions gui/cppcheck_es.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1528,7 +1528,7 @@ Options:
<translation type="unfinished"></translation>
</message>
<message>
<location filename="newsuppressiondialog.cpp" line="82"/>
<location filename="newsuppressiondialog.cpp" line="81"/>
<source>Edit suppression</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -2312,27 +2312,27 @@ Options:
<translation>Fichero no definido</translation>
</message>
<message>
<location filename="resultstree.cpp" line="867"/>
<location filename="resultstree.cpp" line="865"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="resultstree.cpp" line="1060"/>
<location filename="resultstree.cpp" line="1058"/>
<source>Could not find file:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="resultstree.cpp" line="1064"/>
<location filename="resultstree.cpp" line="1062"/>
<source>Please select the folder &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="resultstree.cpp" line="1065"/>
<location filename="resultstree.cpp" line="1063"/>
<source>Select Directory &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="resultstree.cpp" line="1067"/>
<location filename="resultstree.cpp" line="1065"/>
<source>Please select the directory where file is located.</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -2357,27 +2357,27 @@ Options:
<translation>depuración</translation>
</message>
<message>
<location filename="resultstree.cpp" line="866"/>
<location filename="resultstree.cpp" line="864"/>
<source>Recheck</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="resultstree.cpp" line="868"/>
<location filename="resultstree.cpp" line="866"/>
<source>Hide</source>
<translation>Ocultar</translation>
</message>
<message>
<location filename="resultstree.cpp" line="869"/>
<location filename="resultstree.cpp" line="867"/>
<source>Hide all with id</source>
<translation>Ocultar todos con el mismo id</translation>
</message>
<message>
<location filename="resultstree.cpp" line="888"/>
<location filename="resultstree.cpp" line="886"/>
<source>Suppress selected id(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="resultstree.cpp" line="870"/>
<location filename="resultstree.cpp" line="868"/>
<source>Open containing folder</source>
<translation>Abrir carpeta contenedora</translation>
</message>
Expand All @@ -2387,23 +2387,23 @@ Options:
<translation type="unfinished"></translation>
</message>
<message>
<location filename="resultstree.cpp" line="909"/>
<location filename="resultstree.cpp" line="907"/>
<source>Tag</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="resultstree.cpp" line="911"/>
<location filename="resultstree.cpp" line="909"/>
<source>No tag</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="resultstree.cpp" line="942"/>
<location filename="resultstree.cpp" line="956"/>
<location filename="resultstree.cpp" line="940"/>
<location filename="resultstree.cpp" line="954"/>
<source>Cppcheck</source>
<translation>Cppcheck</translation>
</message>
<message>
<location filename="resultstree.cpp" line="943"/>
<location filename="resultstree.cpp" line="941"/>
<source>No editor application configured.

Configure the editor application for Cppcheck in preferences/Applications.</source>
Expand All @@ -2413,7 +2413,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
Configura el programa para editar en Preferencias/Aplicaciones.</translation>
</message>
<message>
<location filename="resultstree.cpp" line="957"/>
<location filename="resultstree.cpp" line="955"/>
<source>No default editor application selected.

Please select the default editor application in preferences/Applications.</source>
Expand All @@ -2422,12 +2422,12 @@ Please select the default editor application in preferences/Applications.</sourc
Configura el programa para editar por defecto en Preferencias/Aplicaciones.</translation>
</message>
<message>
<location filename="resultstree.cpp" line="983"/>
<location filename="resultstree.cpp" line="981"/>
<source>Could not find the file!</source>
<translation>¡No se ha encontrado el fichero!</translation>
</message>
<message>
<location filename="resultstree.cpp" line="1046"/>
<location filename="resultstree.cpp" line="1044"/>
<source>Could not start %1

Please check the application path and parameters are correct.</source>
Expand All @@ -2436,7 +2436,7 @@ Please check the application path and parameters are correct.</source>
Por favor comprueba que la ruta a la aplicación y los parámetros son correctos.</translation>
</message>
<message>
<location filename="resultstree.cpp" line="1068"/>
<location filename="resultstree.cpp" line="1066"/>
<source>Select Directory</source>
<translation>Selecciona carpeta</translation>
</message>
Expand Down
Loading

0 comments on commit f531f5d

Please sign in to comment.