[Cmake-commits] CMake branch, next, updated. v2.8.8-3646-g19ecefe
Stephen Kelly
steveire at gmail.com
Fri Aug 10 04:54:56 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 19ecefe44161e0e33dc3ede86d8316d1cf37f4ab (commit)
via 6ec6d5b289a3c70d0d04be3e261629314f4acf3f (commit)
from bbff1c988ecef6bc7155e67969bdb3747daa04a0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19ecefe44161e0e33dc3ede86d8316d1cf37f4ab
commit 19ecefe44161e0e33dc3ede86d8316d1cf37f4ab
Merge: bbff1c9 6ec6d5b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 10 04:54:53 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 10 04:54:53 2012 -0400
Merge topic 'generate_export_header-fixes' into next
6ec6d5b Generate a better message if neither C nor C++ compiler is loaded.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ec6d5b289a3c70d0d04be3e261629314f4acf3f
commit 6ec6d5b289a3c70d0d04be3e261629314f4acf3f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 10 10:48:51 2012 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 10 10:48:51 2012 +0200
Generate a better message if neither C nor C++ compiler is loaded.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 12354b3..22fd33d 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -155,15 +155,19 @@ endif()
macro(_check_compiler_flag)
if (CMAKE_CXX_COMPILER_LOADED)
check_cxx_compiler_flag(${ARGN})
- else()
+ elseif(CMAKE_C_COMPILER_LOADED)
check_c_compiler_flag(${ARGN})
+ else()
+ message(FATAL_ERROR "This module requires at least a C or C++ compiler.")
endif()
endmacro()
macro(_check_source_compiles)
if (CMAKE_CXX_COMPILER_LOADED)
check_cxx_source_compiles(${ARGN})
- else()
+ elseif(CMAKE_C_COMPILER_LOADED)
check_c_source_compiles(${ARGN})
+ else()
+ message(FATAL_ERROR "This module requires at least a C or C++ compiler.")
endif()
endmacro()
-----------------------------------------------------------------------
Summary of changes:
Modules/GenerateExportHeader.cmake | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list