Skip to content

Commit aae5cd8

Browse files
[CMAKE] Remove obsolete 'GCC_VERSION' checks (reactos#2962)
following upgrade to RosBE 2.2.0 support and GCC 8.4.
1 parent 54e0dbe commit aae5cd8

File tree

11 files changed

+13
-19
lines changed

11 files changed

+13
-19
lines changed

modules/rosapps/applications/devutils/createspec/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
if(GCC AND GCC_VERSION VERSION_GREATER 7)
2+
if(GCC)
33
add_compile_flags("-Wno-stringop-overflow")
44
endif()
55

modules/rostests/winetests/advpack/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
add_definitions(-DUSE_WINE_TODOS)
33

4-
if(GCC AND GCC_VERSION VERSION_GREATER 7)
4+
if(GCC)
55
add_compile_flags("-Wno-format-overflow")
66
endif()
77

modules/rostests/winetests/fusion/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
add_definitions(-DUSE_WINE_TODOS)
33

4-
if(GCC AND GCC_VERSION VERSION_GREATER 7)
4+
if(GCC)
55
add_compile_flags("-Wno-format-overflow")
66
endif()
77

modules/rostests/winetests/msi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if(MSVC_IDE)
88
include_directories($<TARGET_FILE_DIR:custom>)
99
endif()
1010

11-
if(GCC AND GCC_VERSION VERSION_GREATER 7)
11+
if(GCC)
1212
add_compile_flags("-Wno-format-overflow")
1313
endif()
1414

modules/rostests/winetests/msvcrt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ add_definitions(
44
-D_CRT_NONSTDC_NO_DEPRECATE
55
-D__msvcrt_ulong=ULONG)
66

7-
if(GCC AND GCC_VERSION VERSION_GREATER 7)
7+
if(GCC)
88
add_compile_flags("-Wno-stringop-truncation")
99
endif()
1010

modules/rostests/winetests/services/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
if(GCC AND GCC_VERSION VERSION_GREATER 7)
2+
if(GCC)
33
add_compile_flags("-Wno-format-overflow")
44
endif()
55

modules/rostests/winetests/setupapi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
if(GCC AND GCC_VERSION VERSION_GREATER 7)
2+
if(GCC)
33
add_compile_flags("-Wno-format-overflow")
44
endif()
55

modules/rostests/winetests/shell32/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG)
33

44
remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
55

6-
if(GCC AND GCC_VERSION VERSION_GREATER 7)
6+
if(GCC)
77
add_compile_flags("-Wno-format-overflow")
88
endif()
99

modules/rostests/winetests/user32/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_definitions(-DWINVER=0x602 -D_WIN32_WINNT=0x602)
55
if(MSVC)
66
# Disable warning C4477 (printf format warnings)
77
add_compile_flags("/wd4477")
8-
elseif(GCC AND GCC_VERSION VERSION_GREATER 7)
8+
elseif(GCC)
99
add_compile_flags("-Wno-format-overflow")
1010
endif()
1111

modules/rostests/winetests/version/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
add_definitions(-DUSE_WINE_TODOS)
33

4-
if(GCC AND GCC_VERSION VERSION_GREATER 7)
4+
if(GCC)
55
add_compile_flags("-Wno-format-overflow")
66
endif()
77

sdk/cmake/gcc.cmake

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,8 @@ add_compile_flags("-pipe -fms-extensions -fno-strict-aliasing")
4444
# Prevent GCC from searching any of the default directories
4545
add_compile_flags("-nostdinc")
4646

47-
if(GCC_VERSION VERSION_GREATER 4.7)
48-
add_compile_flags("-mstackrealign")
49-
endif()
50-
if(NOT GCC_VERSION VERSION_LESS 4.8)
51-
add_compile_flags("-fno-aggressive-loop-optimizations")
52-
endif()
47+
add_compile_flags("-mstackrealign")
48+
add_compile_flags("-fno-aggressive-loop-optimizations")
5349

5450
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
5551
add_compile_flags_language("-std=gnu99 -Wno-microsoft" "C")
@@ -112,9 +108,7 @@ endif()
112108

113109
add_compile_flags("-Wall -Wpointer-arith")
114110
add_compile_flags("-Wno-char-subscripts -Wno-multichar -Wno-unused-value")
115-
if(NOT GCC_VERSION VERSION_LESS 6.1)
116-
add_compile_flags("-Wno-unused-const-variable")
117-
endif()
111+
add_compile_flags("-Wno-unused-const-variable")
118112
add_compile_flags("-Wno-unused-local-typedefs")
119113
add_compile_flags("-Wno-deprecated")
120114

0 commit comments

Comments
 (0)