From 4a2b708144f3f7c320a68ff39f0d2236981b93a1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 12 Jun 2023 09:59:23 -0400 Subject: Modules: Restore unnecessary inclusions for compatibility Since commit 03c6ebf2b5 (Modules:Check,GenerateExportHeader: include only what's needed, 2023-03-09, v3.27.0-rc1~327^2) some existing projects broke because they were accidentally relying on indirect inclusion of some check modules. For now, restore the unnecessary includes for compatibility. They can be removed with a policy later. Fixes: #24991 Issue: #24994 --- Modules/CheckCCompilerFlag.cmake | 4 ++++ Modules/CheckCXXCompilerFlag.cmake | 4 ++++ Modules/CheckFortranCompilerFlag.cmake | 4 ++++ Modules/CheckOBJCCompilerFlag.cmake | 4 ++++ Modules/CheckOBJCXXCompilerFlag.cmake | 4 ++++ Modules/CheckStructHasMember.cmake | 5 +++++ Modules/GenerateExportHeader.cmake | 5 +++++ 7 files changed, 30 insertions(+) diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake index cd89a55..12b0976 100644 --- a/Modules/CheckCCompilerFlag.cmake +++ b/Modules/CheckCCompilerFlag.cmake @@ -50,3 +50,7 @@ include(Internal/CheckCompilerFlag) macro (CHECK_C_COMPILER_FLAG _FLAG _RESULT) cmake_check_compiler_flag(C "${_FLAG}" ${_RESULT}) endmacro () + +# FIXME(#24994): The following module is included only for compatibility +# with projects that accidentally relied on it with CMake 3.26 and below. +include(CheckCSourceCompiles) diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake index a6884f5..61ed640 100644 --- a/Modules/CheckCXXCompilerFlag.cmake +++ b/Modules/CheckCXXCompilerFlag.cmake @@ -33,3 +33,7 @@ include(Internal/CheckCompilerFlag) macro (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT) cmake_check_compiler_flag(CXX "${_FLAG}" ${_RESULT}) endmacro () + +# FIXME(#24994): The following module is included only for compatibility +# with projects that accidentally relied on it with CMake 3.26 and below. +include(CheckCXXSourceCompiles) diff --git a/Modules/CheckFortranCompilerFlag.cmake b/Modules/CheckFortranCompilerFlag.cmake index c3cd088..9164565 100644 --- a/Modules/CheckFortranCompilerFlag.cmake +++ b/Modules/CheckFortranCompilerFlag.cmake @@ -52,3 +52,7 @@ include(Internal/CheckCompilerFlag) macro (CHECK_FORTRAN_COMPILER_FLAG _FLAG _RESULT) cmake_check_compiler_flag(Fortran "${_FLAG}" ${_RESULT}) endmacro () + +# FIXME(#24994): The following module is included only for compatibility +# with projects that accidentally relied on it with CMake 3.26 and below. +include(CheckFortranSourceCompiles) diff --git a/Modules/CheckOBJCCompilerFlag.cmake b/Modules/CheckOBJCCompilerFlag.cmake index ceb7e17..24bf0db 100644 --- a/Modules/CheckOBJCCompilerFlag.cmake +++ b/Modules/CheckOBJCCompilerFlag.cmake @@ -52,3 +52,7 @@ include(Internal/CheckCompilerFlag) macro (CHECK_OBJC_COMPILER_FLAG _FLAG _RESULT) cmake_check_compiler_flag(OBJC "${_FLAG}" ${_RESULT}) endmacro () + +# FIXME(#24994): The following module is included only for compatibility +# with projects that accidentally relied on it with CMake 3.26 and below. +include(CheckOBJCSourceCompiles) diff --git a/Modules/CheckOBJCXXCompilerFlag.cmake b/Modules/CheckOBJCXXCompilerFlag.cmake index 47dacc2..ae2d907 100644 --- a/Modules/CheckOBJCXXCompilerFlag.cmake +++ b/Modules/CheckOBJCXXCompilerFlag.cmake @@ -52,3 +52,7 @@ include(Internal/CheckCompilerFlag) macro (CHECK_OBJCXX_COMPILER_FLAG _FLAG _RESULT) cmake_check_compiler_flag(OBJCXX "${_FLAG}" ${_RESULT}) endmacro () + +# FIXME(#24994): The following module is included only for compatibility +# with projects that accidentally relied on it with CMake 3.26 and below. +include(CheckOBJCXXSourceCompiles) diff --git a/Modules/CheckStructHasMember.cmake b/Modules/CheckStructHasMember.cmake index 81ea9fd..72fd093 100644 --- a/Modules/CheckStructHasMember.cmake +++ b/Modules/CheckStructHasMember.cmake @@ -81,3 +81,8 @@ int main() message(FATAL_ERROR "Unknown language:\n ${_lang}\nSupported languages: C, CXX.\n") endif() endmacro () + +# FIXME(#24994): The following modules are included only for compatibility +# with projects that accidentally relied on them with CMake 3.26 and below. +include(CheckCSourceCompiles) +include(CheckCXXSourceCompiles) diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index 01a6e4f..9fdc783 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -453,3 +453,8 @@ function(add_compiler_export_flags) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" PARENT_SCOPE) endif() endfunction() + +# FIXME(#24994): The following module(s) are included only for compatibility +# with projects that accidentally relied on them with CMake 3.26 and below. +include(CheckCCompilerFlag) +include(CheckCXXCompilerFlag) -- cgit v0.12