[Cmake-commits] CMake branch, next, updated. v2.8.3-1348-g023adf7
Brad King
brad.king at kitware.com
Fri Jan 14 08:08:54 EST 2011
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 023adf72cef1123a98abd6817a733ed97a9fb550 (commit)
via cabb6cd00e2c7424d2be2b8c4103ab2bb2940832 (commit)
from 2eadd03758ac7369c8bc50427c7e539ca373c5c9 (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=023adf72cef1123a98abd6817a733ed97a9fb550
commit 023adf72cef1123a98abd6817a733ed97a9fb550
Merge: 2eadd03 cabb6cd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 14 08:08:52 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 14 08:08:52 2011 -0500
Merge topic 'doc-try_compile-clarification' into next
cabb6cd Document Check(C|CXX)SourceCompiles behavior more clearly (#11688)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cabb6cd00e2c7424d2be2b8c4103ab2bb2940832
commit cabb6cd00e2c7424d2be2b8c4103ab2bb2940832
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 14 07:36:59 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 14 07:36:59 2011 -0500
Document Check(C|CXX)SourceCompiles behavior more clearly (#11688)
Explicitly state up front that the macros try to link an executable and
that the source provided must define 'main'.
diff --git a/Modules/CheckCSourceCompiles.cmake b/Modules/CheckCSourceCompiles.cmake
index e8bfc0c..d59fe55 100644
--- a/Modules/CheckCSourceCompiles.cmake
+++ b/Modules/CheckCSourceCompiles.cmake
@@ -1,6 +1,6 @@
-# - Check if the given C source code compiles.
+# - Check if given C source compiles and links into an executable
# CHECK_C_SOURCE_COMPILES(<code> <var> [FAIL_REGEX <fail-regex>])
-# <code> - source code to try to compile
+# <code> - source code to try to compile, must define 'main'
# <var> - variable to store whether the source code compiled
# <fail-regex> - fail if test output matches this regex
# The following variables may be set before calling this macro to
diff --git a/Modules/CheckCXXSourceCompiles.cmake b/Modules/CheckCXXSourceCompiles.cmake
index 4502c6b..0491b37 100644
--- a/Modules/CheckCXXSourceCompiles.cmake
+++ b/Modules/CheckCXXSourceCompiles.cmake
@@ -1,6 +1,6 @@
-# - Check if the given C++ source code compiles.
+# - Check if given C++ source compiles and links into an executable
# CHECK_CXX_SOURCE_COMPILES(<code> <var> [FAIL_REGEX <fail-regex>])
-# <code> - source code to try to compile
+# <code> - source code to try to compile, must define 'main'
# <var> - variable to store whether the source code compiled
# <fail-regex> - fail if test output matches this regex
# The following variables may be set before calling this macro to
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckCSourceCompiles.cmake | 4 ++--
Modules/CheckCXXSourceCompiles.cmake | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list