Commit Graph

36406 Commits

Author SHA1 Message Date
Sebastian Holtermann
d8a99dd2ea Autogen: Update AUTOUIC documentation for search paths 2017-08-15 12:57:32 +02:00
Sebastian Holtermann
02e6c54813 Autogen: Restore AUTOUIC lookup paths from 3.8.2
When encountering an `#include "<PATH>ui_<BASE>.h"` statement,
search for `<BASE>.ui` in
 - <SOURCE_DIR>/<BASE>.ui
 - <SOURCE_DIR>/<PATH><BASE>.ui
 - <AUTOUIC_SEARCH_PATH>/<BASE>.ui
 - <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui

In CMake 3.8.2 the lookup list was
  - <SOURCE_DIR>/<BASE>.ui

In CMake 3.9.[01] the lookup list was
 - <SOURCE_DIR>/<PATH><BASE.ui>
 - <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui

Closes #17168
2017-08-15 12:17:37 +02:00
Brad King
fca4423786 CMake 3.9.1 v3.9.1 2017-08-10 09:36:24 -04:00
Brad King
c94c6bae72 Merge branch 'doc-CMP0069-typos' into release-3.9
Merge-request: !1122
2017-08-10 09:27:30 -04:00
Brad King
8c0afd2c75 Merge branch 'find-package_root-disable' into release-3.9
Merge-request: !1116
2017-08-10 09:27:19 -04:00
Ruslan Baratov
8d56308c44 Help: Fix module and function names in CMP0069 examples
Fixes: #17153
2017-08-10 09:03:49 -04:00
Brad King
578d95f87d find_*: Disable the PACKAGE_ROOT search path group for CMake 3.9
Disable the feature added by commit v3.9.0-rc1~71^2~2 (find_*: Add a new
PackageRoot search path group, 2017-05-03) and remove documentation
added by commit v3.9.0-rc1~71^2 (find_*: Add docs for PackageRoot search
path group, 2017-05-03).  Unfortunately the name `<pkg>_ROOT` may
already be set by projects for their own incompatible purposes.  Disable
the behavior change for now to fix the regression for CMake 3.9.  We can
restore it later with a policy.

In order to keep the implementation and tests working, add an
undocumented variable we can use in the tests to enable the behavior
before the policy is introduced.

Fixes: #17144
2017-08-08 11:52:28 -04:00
Brad King
2610c1a733 Merge branch 'autogen-create-include-dir' into release-3.9
Merge-request: !1113
2017-08-08 10:10:09 -04:00
Brad King
9e2a8afb57 Merge branch 'find-package_root-test-regex' into release-3.9
Merge-request: !1115
2017-08-08 08:26:58 -04:00
Brad King
6e5ad2716f Merge branch 'update-expat' into release-3.9
Merge-request: !1110
2017-08-08 08:26:44 -04:00
Brad King
e574bce15b Tests: Simplify RunCMake.find_package PackageRoot case regexes 2017-08-08 08:23:57 -04:00
Sebastian Holtermann
6a0605c711 Autogen: Always create AUTOMOC/AUTOUIC include directory
The **AUTOGEN** include directory was always passed to the compiler but
only generated on demand. To avoid compiler complaints when using
`-Wmissing-include-dirs` make sure the directory gets created always.

Closes #17147
2017-08-08 12:11:10 +02:00
Brad King
e4ea628b42 expat: Update CMake build for 2.2.3 2017-08-07 10:22:13 -04:00
Brad King
44e5fb9c7e Merge branch 'upstream-expat' into update-expat
* upstream-expat:
  expat 2017-08-02 (97c6bd01)
2017-08-07 10:19:30 -04:00
Expat Upstream
7e08602c76 expat 2017-08-02 (97c6bd01)
Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit 97c6bd01990090d4015364ae37dd141f3c39a30f (R_2_2_3).
2017-08-07 10:06:36 -04:00
Brad King
6276ec3726 expat: Update script to get Expat 2.2.3 2017-08-07 10:06:23 -04:00
Brad King
8fb12ce7a2 Merge branch 'add-package_root-to-find_package' into release-3.9
Merge-request: !1082
2017-08-03 15:05:30 -04:00
Brad King
9d09d1a922 Merge branch 'android-plain-sysroot' into release-3.9
Merge-request: !1101
2017-08-03 12:47:11 -04:00
Brad King
68d67c827f Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILE
If `CMAKE_SYSROOT` is set by the user (e.g. via the toolchain file) then
we do not set `CMAKE_SYSROOT_COMPILE` to our default.  Fix our
references to the sysroot's `/usr/include` directory to use
`CMAKE_SYSROOT_COMPILE` only if it is set and else `CMAKE_SYSROOT`.

Fixes: #17096
2017-08-03 12:03:59 -04:00
Brad King
cc08d0872c Merge branch 'vs-VCTargetsPath-force-config' into release-3.9
Merge-request: !1100
2017-08-03 12:00:05 -04:00
Brad King
fe3b481bab VS: Fix VCTargetsPath detection
In some environments MSBuild chooses the `Release` configuration
even though only `Debug` is available in our detection project.
Force use of the `Debug` configuration with a command-line option.

Fixes: #17118
2017-08-03 11:54:02 -04:00
Brad King
dcb01e97cd Merge branch 'doc-release-notes-orphan' into release-3.9
Merge-request: !1077
2017-08-03 09:39:13 -04:00
Björn Esser
9e225766ae Help: Silence warning about document not included in toctree
When not using the html or text builders, `Help/index.rst` does not
include `Help/release/index.rst` in the toctree.  Silence the warning.
2017-08-03 09:36:08 -04:00
Brad King
a7e4d595f9 Merge branch 'server-fix-crash' into release-3.9
Merge-request: !1096
2017-08-02 16:27:06 -04:00
Laurent Rineau
70272f3c36 server: Fix crash on missing cache entries
Test for nullptr before constructing std::string.
2017-08-02 16:13:55 -04:00
Chuck Atkins
4a20711690 find_package: Split PACKAGE_ROOT tests to work with smaller regex 2017-08-02 12:03:52 -04:00
Brad King
1181ad61d2 Merge branch 'UseSWIG-Java-enabled' into release-3.9
Merge-request: !1095
2017-08-02 11:56:07 -04:00
Brad King
b4fbf677bb UseSWIG: Fix when Java is enabled as a language
Since commit v3.8.0-rc1~251^2 (UseSWIG: Record generated java files as
custom command outputs, 2016-11-28) the generated `.java` files are
listed as sources in the call to `add_library` by swig_add_library.
They are listed only as the outputs of custom commands and not intended
for compilation as part of the library.

Reported-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
2017-08-02 11:52:36 -04:00
Brad King
39bd20a490 Merge branch 'FindJava-fix-1.6-registry' into release-3.9
Merge-request: !1079
2017-08-02 11:31:27 -04:00
Rechi Rechi
5479074be1 FindJava: fix hint for windows jre 1.6
Fix typo in commit v3.8.0-rc1~112^2 (FindJava: add hints for jre,
2017-01-11).
2017-08-02 11:30:48 -04:00
Brad King
dc859d3da1 Merge branch 'sphinx-pre-1.2' into release-3.9
Merge-request: !1089
2017-08-02 11:27:45 -04:00
Björn Esser
2a68ff7fd7 Utilities/Sphinx: Restore compatibility with Sphinx pre-1.2
Since commit v3.8.0-rc2~28^2~2 (Utilities/Sphinx: Port cmake extension
to Sphinx 1.4, 2017-02-09) we use the `sphinx.version_info` tuple.
However, it was added in Sphinx v1.2 so the check breaks compatibility
with older versions.  Revise our check to assume Sphinx pre-1.2 if the
version tuple does not exist.
2017-08-02 11:25:21 -04:00
Craig Scott
f71f1943db Merge branch 'FindJava_earlyAccessDebian' into release-3.9
Tested-by: Felix Geyer <debfx@fobos.de>
Merge-request: !1080
2017-08-02 11:15:42 -04:00
Craig Scott
833132917c Merge branch 'FindBoost-fix-early-return' into release-3.9
Merge-request: !1078
2017-08-02 11:15:18 -04:00
Chuck Atkins
9722ff5a6f find_package: Fix PACKAGE_ROOT test to check find_pacakge(CONFIG) mode. 2017-07-28 10:49:13 -04:00
Chuck Atkins
c5d2b99c02 find_package: Add missing PACKAGE_ROOT_PATH search path implementation. 2017-07-28 10:49:13 -04:00
Cristian Adam
eddbd62d0f FindBoost: pop policy stack before returning
CMake would give a fatal error if the policy stack was cleaned up
upon exiting the module.
2017-07-27 07:49:48 +10:00
Craig Scott
e42fa012b6 Allow early access version trailing string to be mixed case
The original regex was expecting to match strings like "ea", but it has
been reported that other strings like "Debian" are also possible.
2017-07-25 22:35:45 +10:00
Brad King
f15cfd891d CMake 3.9.0 v3.9.0 2017-07-18 11:18:18 -04:00
Brad King
b97878643b Merge branch 'objlib-own-target-objs' into release-3.9 2017-07-17 11:42:18 -04:00
Brad King
d89e10cd58 Diagnose object library self-reference
The code

    add_library(A OBJECT a.c)
    target_sources(A PRIVATE $<TARGET_OBJECTS:A>)

used to crash CMake via infinite recursion while evaluating the
generator expression.  Then the change in commit v3.9.0-rc1~266^2~1
(cmGeneratorTarget: Replace source classifier implementation,
2017-04-07) avoided the infinite recursion because GetKindedSources now
creates a map entry and initializes it once.  If it is called again on
the same target during that initialization, the partially computed
results are returned.  This is still wrong but does not crash.
Detect and diagnose this case instead.

Co-Author: Ben Boeckel <ben.boeckel@kitware.com>
Fixes: #16578
2017-07-14 14:05:22 -04:00
Brad King
f2b05a095a Merge branch 'doc-vs2015-update-relnote' into release-3.9 2017-07-14 11:02:45 -04:00
Brad King
cfa9a2bd88 Help: Add a 3.9 release note about the VS GenerateDebugInformation update
Add a release note corresponding to the environmental regression fixed
by commit v3.9.0-rc6~15^2~1 (VS: Fix GenerateDebugInformation values for
v140 and v141 toolsets, 2017-06-27).
2017-07-14 11:02:17 -04:00
Brad King
68a64478c5 Merge branch 'xcode9support' into release-3.9 2017-07-14 10:40:33 -04:00
Harry Mallon
0348383b8c Xcode: Add "outputPaths" to custom command script build phase
This is needed for Xcode 9's "New Build System", whose release notes
mention "that output must be declared as an explicit output by the
script which generates it" in reference to outputs of custom script
build phases.
2017-07-14 10:38:00 -04:00
Brad King
8c7facd69b Merge branch 'backport-fix-lang-std-option-list' into release-3.9 2017-07-14 10:20:12 -04:00
Brad King
218ce158f2 Features: Fix support for a list of language standard options
The change in commit v3.9.0-rc1~174^2~2 (CompileFeatures: Let STD
compile options be a list, 2016-10-05) did not change all the places we
add the language standard options.  Expand the list in the other places.
2017-07-14 10:19:44 -04:00
Brad King
13e9a370d9 Merge branch 'TestDriver-fix-Wconversion' into release-3.9 2017-07-14 08:01:55 -04:00
Brad King
221ffabfad TestDriver: Fix -Wconversion warning
Since commit v3.8.0-rc1~51^2~1 (TestDriver: calc NumTests at compile
time, 2017-01-24) we convert an expression that uses `sizeof()` to an
`int` as a compile-time constant.  Some GCC versions warn about this
with `-Wconversion`.  Add a cast to avoid the warning.
2017-07-14 08:01:26 -04:00
Brad King
9d9085ab36 Merge branch 'ninja_cuda_export_compile_commands_support' into release-3.9 2017-07-13 11:40:08 -04:00