Skip to content

Commit 6409e43

Browse files
brad0grooverdan
authored andcommitted
Replace deprecated CMAKE_COMPILER_IS_GNU(CC|CXX) with CMAKE_(C|CXX)_COMPILER_ID
As of CMake 3.24 CMAKE_COMPILER_IS_GNU(CC|CXX) are deprecated and should be replaced with CMAKE_(C|CXX)_COMPILER_ID which were introduced with CMake 2.6.
1 parent 5cd982c commit 6409e43

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ ENDIF()
292292
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
293293
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
294294

295-
IF(CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
295+
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
296296
# Enable extra checks when using a recent enough version of GNU libstdc++
297297
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG -D_GLIBCXX_ASSERTIONS")
298298
ENDIF()

cmake/build_configurations/mysql_release.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ ENDIF()
174174
IF(UNIX)
175175

176176
# Default GCC flags
177-
IF(CMAKE_COMPILER_IS_GNUCC)
177+
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
178178
SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized")
179179
STRING(APPEND CMAKE_C_FLAGS_DEBUG " ${COMMON_C_FLAGS}")
180180
STRING(APPEND CMAKE_C_FLAGS_RELEASE " ${COMMON_C_FLAGS}")
@@ -183,7 +183,7 @@ IF(UNIX)
183183
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
184184
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
185185
ENDIF()
186-
IF(CMAKE_COMPILER_IS_GNUCXX)
186+
IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
187187
SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized")
188188
STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " ${COMMON_CXX_FLAGS}")
189189
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " ${COMMON_CXX_FLAGS}")
@@ -203,11 +203,11 @@ IF(UNIX)
203203
SET(z_flags "")
204204
ENDIF()
205205

206-
IF(CMAKE_COMPILER_IS_GNUCC)
206+
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
207207
STRING(APPEND CMAKE_C_FLAGS_RELEASE " ${z_flags}")
208208
STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " ${z_flags}")
209209
ENDIF()
210-
IF(CMAKE_COMPILER_IS_GNUCXX)
210+
IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
211211
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " ${z_flags}")
212212
STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${z_flags}")
213213
ENDIF()

cmake/dtrace.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# along with this program; if not, write to the Free Software
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1515

16-
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX
16+
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
1717
AND CMAKE_SIZEOF_VOID_P EQUAL 4)
1818
IF(NOT DEFINED BUGGY_GCC_NO_DTRACE_MODULES)
1919
EXECUTE_PROCESS(

cmake/maintainer.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ ENDFOREACH()
6060

6161
SET(MY_ERROR_FLAGS -Werror -fno-operator-names)
6262

63-
IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
63+
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
6464
SET(MY_ERROR_FLAGS ${MY_ERROR_FLAGS} -Wno-error=maybe-uninitialized)
6565
SET(MY_ERROR_FLAGS ${MY_ERROR_FLAGS} -Wno-error=non-virtual-dtor) # gcc bug 7302
6666
ENDIF()

cmake/os/SunOS.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ CHECK_C_SOURCE_RUNS(
6969

7070

7171
# Check is special processor flag needs to be set on older GCC
72-
#that defaults to v8 sparc . Code here is taken from my_rdtsc.h
73-
IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZEOF_VOID_P EQUAL 4
72+
# that defaults to v8 sparc . Code here is taken from my_rdtsc.h
73+
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_SIZEOF_VOID_P EQUAL 4
7474
AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
7575
SET(SOURCE
7676
"

mysys/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,19 @@ IF(MSVC_INTEL)
6767
ENDIF()
6868
ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|i386|i686")
6969
SET(MYSYS_SOURCES ${MYSYS_SOURCES} crc32/crc32_x86.c crc32/crc32c_x86.cc)
70-
IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5")
70+
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5")
7171
SET_SOURCE_FILES_PROPERTIES(crc32/crc32_x86.c PROPERTIES
7272
COMPILE_FLAGS "-msse4.2 -mpclmul")
7373
ENDIF()
7474
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
7575
SET(MYSYS_SOURCES ${MYSYS_SOURCES} crc32/crc32c_amd64.cc)
76-
IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5")
76+
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5")
7777
SET_SOURCE_FILES_PROPERTIES(crc32/crc32c_amd64.cc PROPERTIES
7878
COMPILE_FLAGS "-msse4.2 -mpclmul")
7979
ENDIF()
8080
ENDIF()
8181
ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
82-
IF(CMAKE_COMPILER_IS_GNUCC)
82+
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
8383
include(CheckCXXSourceCompiles)
8484

8585
CHECK_CXX_SOURCE_COMPILES("

scripts/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ ELSE()
394394
ENDIF()
395395

396396
# Install libgcc as mylibgcc.a
397-
IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
397+
IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_FLAGS MATCHES "-static")
398398
EXECUTE_PROCESS (
399399
COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}
400400
${CMAKE_CXX_FLAGS} --print-libgcc

storage/innobase/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ENDIF()
9595

9696
IF(NOT MSVC)
9797
# Work around MDEV-18417, MDEV-18656, MDEV-18417
98-
IF(WITH_ASAN AND CMAKE_COMPILER_IS_GNUCC AND
98+
IF(WITH_ASAN AND CMAKE_C_COMPILER_ID STREQUAL "GNU" AND
9999
CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
100100
SET_SOURCE_FILES_PROPERTIES(trx/trx0rec.cc PROPERTIES COMPILE_FLAGS -O1)
101101
ENDIF()
@@ -455,7 +455,7 @@ ADD_DEFINITIONS(${SSL_DEFINES} ${TPOOL_DEFINES})
455455

456456
# A GCC bug causes crash when compiling these files on ARM64 with -O1+
457457
# Compile them with -O0 as a workaround.
458-
IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64"
458+
IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64"
459459
AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5.2.0")
460460
ADD_COMPILE_FLAGS(
461461
btr/btr0btr.cc

storage/mroonga/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ else()
326326
if(WITH_DEBUG)
327327
set_property(TARGET mroonga APPEND PROPERTY
328328
COMPILE_DEFINITIONS "SAFE_MUTEX")
329-
if(CMAKE_COMPILER_IS_GNUCXX)
329+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
330330
set(MRN_C_COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS} -g3 -O0")
331331
set(MRN_CXX_COMPILE_FLAGS "${MRN_CXX_COMPILE_FLAGS} -g3 -O0")
332332
endif()
@@ -353,7 +353,7 @@ else()
353353
COMPILE_DEFINITIONS "MY_PTHREAD_FASTMUTEX")
354354
endif()
355355

356-
if(CMAKE_COMPILER_IS_GNUCXX)
356+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
357357
MY_CHECK_AND_SET_COMPILER_FLAG("-Wall")
358358
MY_CHECK_AND_SET_COMPILER_FLAG("-Wextra")
359359
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-unused-parameter")

0 commit comments

Comments
 (0)