Commit Graph

36969 Commits

Author SHA1 Message Date
Kris Thielemans 4150048a3b FindHDF5: unset some variables
prefixed some local variables with _hdf5 and unset them at the end
(still more of these to do)
2017-08-03 09:49:47 -04:00
Kris Thielemans 9310d00822 FindHDF5: for a static imported config, use CONFIG-specific library
first check the LOCATION_<CONFIG> propertiy to find the library, then
LOCATION
2017-08-03 09:49:47 -04:00
Kris Thielemans fc9828448d FindHDF5: fix hdf5-config case with more than one configuration
Select a configuration as the first of the following available:

* MAP_IMPORTED_CONFIG_<CONFIG>
* ${CMAKE_BUILD_TYPE}, RELWITHDEBINFO, RELEASE, DEBUG
* First entry in IMPORTED_CONFIGURATIONS

Fixes: #17039
2017-08-03 09:48:19 -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
Brad King a2bc632d06 Merge topic 'doc-buildsystem-fix'
cc78ff72 Help: Fix example in cmake-buildsystem(7) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1097
2017-08-03 09:38:15 -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 17d236d5ba Merge branch 'release-3.9' 2017-08-03 09:35:14 -04:00
Brad King ee79d7a130 Merge topic 'server-fix-crash'
70272f3c server: Fix crash on missing cache entries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1096
2017-08-03 09:34:15 -04:00
Brad King 973ee6605b Merge topic 'UseSWIG-Java-enabled'
b4fbf677 UseSWIG: Fix when Java is enabled as a language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1095
2017-08-03 09:33:57 -04:00
Kitware Robot 8e8bf42707 CMake Nightly Date Stamp 2017-08-03 00:01:09 -04:00
Craig Scott 54bc20dd8c Merge topic 'autogen-depends'
a3a62fcc Autogen: Add AUTOMOC test for target dependencies forwarding
7fa9c550 Autogen: Forward target dependencies to *_autogen target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1087
2017-08-02 17:44:59 -04:00
Brad King 901456d76e Merge topic 'FindLibXml2-compat'
d1a77565 FindLibXml2: Restore compatibility with projects setting LIBXML2_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1094
2017-08-02 16:28:24 -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
Sebastian Nagel cc78ff72eb Help: Fix example in cmake-buildsystem(7) manual
In the example code `serialization` is a PRIVATE dependency of
`archiveExtras` and not of `archive`.  Fix the corresponding prose.
2017-08-02 16:21:28 -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 6bef326eb4 Merge topic 'update-libarchive'
c80d8cb2 libarchive: Fix inclusion of zlib, bzlib, and lzma for build within CMake
6df1bda1 Merge branch 'upstream-LibArchive' into update-libarchive
11f3dcb0 LibArchive 2017-07-09 (98a69539)
b6674431 libarchive: Update script to get 3.3.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1071
2017-08-02 11:45:35 -04:00
Brad King 83c8663910 Merge branch 'release-3.9' 2017-08-02 11:42:56 -04:00
Brad King 155dc75b89 Merge topic 'FindJava-fix-1.6-registry'
5479074b FindJava: fix hint for windows jre 1.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1079
2017-08-02 11:42:07 -04:00
Brad King b162e5c0f0 Merge topic 'sphinx-pre-1.2'
2a68ff7f Utilities/Sphinx: Restore compatibility with Sphinx pre-1.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1089
2017-08-02 11:41:44 -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
Brad King bf0ef8c461 Merge branch 'release-3.9' 2017-08-02 11:16:44 -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
Brad King d1a7756547 FindLibXml2: Restore compatibility with projects setting LIBXML2_LIBRARIES
In commit a1b38865 (FindLibXml2: Switch to standard module variable
names, 2017-07-11) the cache variable used to store the find_library
result was renamed.  This breaks projects that set the old variable name
explicitly.  Fix compatibility with such projects by using the old
variable as a default if it is set and the new one is not.
2017-08-02 10:35:07 -04:00
Kitware Robot 611f162532 CMake Nightly Date Stamp 2017-08-02 00:01:05 -04:00
Sebastian Holtermann a3a62fcc3c Autogen: Add AUTOMOC test for target dependencies forwarding
Adds an AUTOMOC test that tests if dependencies from add_dependencies()
of an ORIGIN target are forwarded to the ORIGIN_autogen target.

Also fixes the AUTOMOC test that tests if dependencies from
target_link_libraries() of an ORIGIN target are forwarded to the
ORIGIN_autogen target. The test now fails in the ORIGIN_autogen build
if SimpleLib wasn't built before.
2017-08-01 15:18:46 +02:00
Kitware Robot 748c192f8b CMake Nightly Date Stamp 2017-08-01 00:01:05 -04:00
Kitware Robot df585ca96f CMake Nightly Date Stamp 2017-07-31 00:01:04 -04:00
Kitware Robot 49577c98b4 CMake Nightly Date Stamp 2017-07-30 00:01:05 -04:00
Kitware Robot 5ba1ab4c6b CMake Nightly Date Stamp 2017-07-29 00:01:06 -04:00
Craig Scott ba83708004 Merge topic 'FindMatlab/CUSTOM_TEST_COMMAND-documentation-fix'
5a9c4aeb FindMatlab: CUSTOM_TEST_COMMAND documentation fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1086
2017-07-28 20:07:03 -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
Craig Scott d2d8e9edf3 Merge topic 'FindJava_earlyAccessDebian'
e42fa012 Allow early access version trailing string to be mixed case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Felix Geyer <debfx@fobos.de>
Merge-request: !1080
2017-07-28 07:17:52 -04:00
Sebastian Holtermann 7fa9c55019 Autogen: Forward target dependencies to *_autogen target
Only the dependecies from target_link_libraries() of the origin
target were forwarded to the _autogen target. This patch
adds forwarding of the dependencies from add_dependencies()
to the _autogen target.

Closes #17094
2017-07-28 12:40:18 +02:00
Kitware Robot bfb40bcf66 CMake Nightly Date Stamp 2017-07-28 00:01:07 -04:00
Craig Scott ab17dc6bef Merge topic 'FindBoost'
eddbd62d FindBoost: pop policy stack before returning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1078
2017-07-27 16:59:39 -04:00
Craig Scott 1ed58b686c Merge topic 'autogen-tests-split'
0e434fcf Autogen: Move repeated tests to new QtAutogenRerun test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1075
2017-07-27 15:52:56 -04:00
Raffi Enficiaud 5a9c4aeb9a FindMatlab: CUSTOM_TEST_COMMAND documentation fix
Documentation states CUSTOM_MATLAB_COMMAND, while code uses CUSTOM_TEST_COMMAND.
Addresses issue #17107
2017-07-27 21:35:16 +02:00
Matthew Woehlke bfcda4013a Add dynamic test discovery for for Google Test
Add a new gtest_discover_tests function to GoogleTest.cmake,
implementing dynamic test discovery (i.e. tests are discovered by
actually running the test executable and asking for the list of
available tests, which is used to dynamically declare the tests) rather
than the source-parsing approach used by gtest_add_tests. Compared to
the source-parsing approach, this has the advantage of being robust
against users declaring tests in unusual ways, and much better support
for advanced features such as parameterized tests.

A unit test, modeled after the TEST_INCLUDE_DIR[S] test, is also
included. Note that the unit test does not actually require that Google
Test is available. The new functionality does not actually depend on
Google Test as such; it only requires that the test executable lists
tests in the expected format when invoked with --gtest_list_tests, which
the unit test can fake readily.
2017-07-27 09:47:28 -04:00
Kitware Robot ba184cefcd CMake Nightly Date Stamp 2017-07-27 00:01:07 -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
Kitware Robot f911582423 CMake Nightly Date Stamp 2017-07-26 00:01:04 -04: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