[Cmake-commits] CMake branch, master, updated. v3.10.2-856-g1f35d3f
Kitware Robot
kwrobot at kitware.com
Mon Jan 22 10:15:07 EST 2018
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, master has been updated
via 1f35d3f20a0d7929fb8efc19b6bdc546c16a2c71 (commit)
via 856dc73e024672e650bb47a9b4acd898ad54008e (commit)
via 6ab316c98da3cb928c83a0b9fdda98c99e749eca (commit)
via e720a34399f6613bf89321977646871d15c91a1f (commit)
via c89c87c9be3917c1ab26253b050eafca1a254cb0 (commit)
via 60febda45541c65e0ca7fb4535c629c77c17e13a (commit)
from c2bed75ebed14345cd1cf5f1e4c75eac6e8cb3ff (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f35d3f20a0d7929fb8efc19b6bdc546c16a2c71
commit 1f35d3f20a0d7929fb8efc19b6bdc546c16a2c71
Merge: 856dc73 c89c87c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 22 15:12:42 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 22 10:13:01 2018 -0500
Merge topic 'heading_automoc_macro_names'
c89c87c9 Help: Fix heading level for CMAKE_AUTOMOC_MACRO_NAMES
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1671
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=856dc73e024672e650bb47a9b4acd898ad54008e
commit 856dc73e024672e650bb47a9b4acd898ad54008e
Merge: 6ab316c 60febda
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 22 15:12:14 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 22 10:12:21 2018 -0500
Merge topic 'docs_cmake_crosscompiling'
60febda4 Help: Explain meaning and limitations of CMAKE_CROSSCOMPILING
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1672
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ab316c98da3cb928c83a0b9fdda98c99e749eca
commit 6ab316c98da3cb928c83a0b9fdda98c99e749eca
Merge: c2bed75 e720a34
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 22 15:07:39 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 22 10:07:47 2018 -0500
Merge topic 'iwyu'
e720a343 IWYU: Add more workaround mappings for internal bits
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1681
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e720a34399f6613bf89321977646871d15c91a1f
commit e720a34399f6613bf89321977646871d15c91a1f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 22 09:50:37 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 22 09:56:30 2018 -0500
IWYU: Add more workaround mappings for internal bits
Extend our hack section of mappings to work around IWYU incorrectly
requiring:
* bits/stdint-uintn.h for stdint.h
* bits/stdint-intn.h for stdint.h
* bits/types/mbstate_t.h for wchar.h
diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp
index 5408402..892cdcb 100644
--- a/Utilities/IWYU/mapping.imp
+++ b/Utilities/IWYU/mapping.imp
@@ -23,8 +23,11 @@
# HACK: check whether this can be removed with next iwyu release.
{ include: [ "<bits/shared_ptr.h>", private, "<memory>", public ] },
{ include: [ "<bits/std_function.h>", private, "<functional>", public ] },
+ { include: [ "<bits/stdint-intn.h>", private, "<stdint.h>", public ] },
+ { include: [ "<bits/stdint-uintn.h>", private, "<stdint.h>", public ] },
{ include: [ "<bits/time.h>", private, "<time.h>", public ] },
{ include: [ "<bits/types/clock_t.h>", private, "<time.h>", public ] },
+ { include: [ "<bits/types/mbstate_t.h>", private, "<wchar.h>", public ] },
{ include: [ "<bits/types/struct_timespec.h>", private, "<time.h>", public ] },
{ include: [ "<bits/types/struct_timeval.h>", private, "<time.h>", public ] },
{ include: [ "<bits/types/struct_tm.h>", private, "<time.h>", public ] },
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c89c87c9be3917c1ab26253b050eafca1a254cb0
commit c89c87c9be3917c1ab26253b050eafca1a254cb0
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Fri Jan 19 07:49:51 2018 +1100
Commit: Craig Scott <craig.scott at crascit.com>
CommitDate: Fri Jan 19 08:31:48 2018 +1100
Help: Fix heading level for CMAKE_AUTOMOC_MACRO_NAMES
diff --git a/Help/variable/CMAKE_AUTOMOC_MACRO_NAMES.rst b/Help/variable/CMAKE_AUTOMOC_MACRO_NAMES.rst
index 5b79c40..2c8997b 100644
--- a/Help/variable/CMAKE_AUTOMOC_MACRO_NAMES.rst
+++ b/Help/variable/CMAKE_AUTOMOC_MACRO_NAMES.rst
@@ -12,7 +12,7 @@ information.
The default value is ``Q_OBJECT;Q_GADGET;Q_NAMESPACE``.
Example
--------
+^^^^^^^
Let CMake know that source files that contain ``CUSTOM_MACRO`` must be ``moc``
processed as well::
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60febda45541c65e0ca7fb4535c629c77c17e13a
commit 60febda45541c65e0ca7fb4535c629c77c17e13a
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Fri Jan 19 08:30:53 2018 +1100
Commit: Craig Scott <craig.scott at crascit.com>
CommitDate: Fri Jan 19 08:31:34 2018 +1100
Help: Explain meaning and limitations of CMAKE_CROSSCOMPILING
Fixes: #17653
diff --git a/Help/variable/CMAKE_CROSSCOMPILING.rst b/Help/variable/CMAKE_CROSSCOMPILING.rst
index cf9865b..9e96769 100644
--- a/Help/variable/CMAKE_CROSSCOMPILING.rst
+++ b/Help/variable/CMAKE_CROSSCOMPILING.rst
@@ -1,8 +1,26 @@
CMAKE_CROSSCOMPILING
--------------------
-Is CMake currently cross compiling.
+Intended to indicate whether CMake is cross compiling, but note limitations
+discussed below.
-This variable will be set to true by CMake if CMake is cross
-compiling. Specifically if the build platform is different from the
-target platform.
+This variable will be set to true by CMake if the :variable:`CMAKE_SYSTEM_NAME`
+variable has been set manually (i.e. in a toolchain file or as a cache entry
+from the :manual:`cmake <cmake(1)>` command line). In most cases, manually
+setting :variable:`CMAKE_SYSTEM_NAME` will only be done when cross compiling,
+since it will otherwise be given the same value as
+:variable:`CMAKE_HOST_SYSTEM_NAME` if not manually set, which is correct for
+the non-cross-compiling case. In the event that :variable:`CMAKE_SYSTEM_NAME`
+is manually set to the same value as :variable:`CMAKE_HOST_SYSTEM_NAME`, then
+``CMAKE_CROSSCOMPILING`` will still be set to true.
+
+Another case to be aware of is that builds targeting Apple platforms other than
+macOS are handled differently to other cross compiling scenarios. Rather than
+relying on :variable:`CMAKE_SYSTEM_NAME` to select the target platform, Apple
+device builds use :variable:`CMAKE_OSX_SYSROOT` to select the appropriate SDK,
+which indirectly determines the target platform. Furthermore, when using the
+Xcode generator, developers can switch between device and simulator builds at
+build time rather than having a single choice at configure time, so the concept
+of whether the build is cross compiling or not is more complex. Therefore, the
+use of ``CMAKE_CROSSCOMPILING`` is not recommended for projects targeting Apple
+devices.
-----------------------------------------------------------------------
Summary of changes:
Help/variable/CMAKE_AUTOMOC_MACRO_NAMES.rst | 2 +-
Help/variable/CMAKE_CROSSCOMPILING.rst | 26 ++++++++++++++++++++++----
Utilities/IWYU/mapping.imp | 3 +++
3 files changed, 26 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list