summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-06-12 17:19:01 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-06-12 17:19:17 (GMT)
commit0e4d93f9d7ca4ecc6d12a71625e7117d3abd2238 (patch)
treee49caa22e4f44367427f739aa9eb22b83fe13bd4
parenta70fe8ec829f5efeee9806c460f39c9d55c637ec (diff)
parent4a2b708144f3f7c320a68ff39f0d2236981b93a1 (diff)
downloadCMake-0e4d93f9d7ca4ecc6d12a71625e7117d3abd2238.zip
CMake-0e4d93f9d7ca4ecc6d12a71625e7117d3abd2238.tar.gz
CMake-0e4d93f9d7ca4ecc6d12a71625e7117d3abd2238.tar.bz2
Merge topic 'restore-check-module-deps' into release-3.27
4a2b708144 Modules: Restore unnecessary inclusions for compatibility Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8554
-rw-r--r--Modules/CheckCCompilerFlag.cmake4
-rw-r--r--Modules/CheckCXXCompilerFlag.cmake4
-rw-r--r--Modules/CheckFortranCompilerFlag.cmake4
-rw-r--r--Modules/CheckOBJCCompilerFlag.cmake4
-rw-r--r--Modules/CheckOBJCXXCompilerFlag.cmake4
-rw-r--r--Modules/CheckStructHasMember.cmake5
-rw-r--r--Modules/GenerateExportHeader.cmake5
7 files changed, 30 insertions, 0 deletions
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)