[Cmake-commits] CMake branch, next, updated. v2.8.10-732-g9e802c5
Rolf Eike Beer
eike at sf-mail.de
Sun Nov 4 00:55:23 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 9e802c5d1043f94ad09ec3bc38b9824a64583cc2 (commit)
via 7f75f7c8184474f245063b145d0dff395a9a4882 (commit)
from 88bb57e9c282d6d8790090f7386e3344e560bfcb (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=9e802c5d1043f94ad09ec3bc38b9824a64583cc2
commit 9e802c5d1043f94ad09ec3bc38b9824a64583cc2
Merge: 88bb57e 7f75f7c
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Nov 4 00:55:22 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 4 00:55:22 2012 -0400
Merge topic 'fix-module-includes' into next
7f75f7c revert change in TestBigEndian
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f75f7c8184474f245063b145d0dff395a9a4882
commit 7f75f7c8184474f245063b145d0dff395a9a4882
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Nov 4 05:53:50 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Nov 4 05:53:50 2012 +0100
revert change in TestBigEndian
The include call is inside a macro here, so it will be called from a different
context. Changing this will break e.g. bootstrapping.
diff --git a/Modules/TestBigEndian.cmake b/Modules/TestBigEndian.cmake
index 18f53ac..193df8f 100644
--- a/Modules/TestBigEndian.cmake
+++ b/Modules/TestBigEndian.cmake
@@ -22,7 +22,7 @@ macro(TEST_BIG_ENDIAN VARIABLE)
message(STATUS "Check if the system is big endian")
message(STATUS "Searching 16 bit integer")
- include(${CMAKE_CURRENT_LIST_DIR}/CheckTypeSize.cmake)
+ include(CheckTypeSize)
CHECK_TYPE_SIZE("unsigned short" CMAKE_SIZEOF_UNSIGNED_SHORT)
if(CMAKE_SIZEOF_UNSIGNED_SHORT EQUAL 2)
-----------------------------------------------------------------------
Summary of changes:
Modules/TestBigEndian.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list