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 949ca3769c349da689f5652af81b6bbd41209a1d (commit)
via 7d6d45f23c25355f1da0ad9fcd9e45cdb05194f8 (commit)
via 3c6943eb9da3695316b807f59ba42a1b105a7afb (commit)
from 4c7860ef1a6f664545ae1ecfc86b978ecd299734 (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=949ca3769c349da689f5652af81b6bbd41209a1d
commit 949ca3769c349da689f5652af81b6bbd41209a1d
Merge: 4c7860e 7d6d45f
Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
AuthorDate: Sat Mar 15 18:25:34 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Mar 15 18:25:34 2014 -0400
Merge topic 'CheckTypeSize_#14056' into next
7d6d45f2 CheckTypeSize: Support for CXX when C language is not enabled
3c6943eb CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d6d45f23c25355f1da0ad9fcd9e45cdb05194f8
commit 7d6d45f23c25355f1da0ad9fcd9e45cdb05194f8
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Sat Mar 15 22:56:47 2014 +0100
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Sat Mar 15 23:23:53 2014 +0100
CheckTypeSize: Support for CXX when C language is not enabled
This example now works without need to enable C language:
cmake_minimum_required(VERSION x.x.x)
project(foo CXX)
include(CheckTypeSize)
check_type_size("short" SIZEOF_SHORT LANGUAGE CXX)
Fixes #14056
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index ec28d8b..333b325 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -75,6 +75,7 @@
# License text for the above reference.)
include(CheckIncludeFile)
+include(CheckIncludeFileCXX)
cmake_policy(PUSH)
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
@@ -218,9 +219,15 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE)
set(_builtin 0)
else()
set(_builtin 1)
- check_include_file(sys/types.h HAVE_SYS_TYPES_H)
- check_include_file(stdint.h HAVE_STDINT_H)
- check_include_file(stddef.h HAVE_STDDEF_H)
+ if("${_language}" STREQUAL "C")
+ check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+ check_include_file(stdint.h HAVE_STDINT_H)
+ check_include_file(stddef.h HAVE_STDDEF_H)
+ elseif("${_language}" STREQUAL "CXX")
+ check_include_file_cxx(sys/types.h HAVE_SYS_TYPES_H)
+ check_include_file_cxx(stdint.h HAVE_STDINT_H)
+ check_include_file_cxx(stddef.h HAVE_STDDEF_H)
+ endif()
endif()
unset(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY)
unset(_CHECK_TYPE_SIZE_LANGUAGE)
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckTypeSize.cmake | 13 ++++++++++---
Source/CMakeVersion.cmake | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
