summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-VCTargetsPath-force-config'Brad King2017-08-041-0/+1
|\ | | | | | | | | | | | | fe3b481b VS: Fix VCTargetsPath detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1100
| * VS: Fix VCTargetsPath detectionBrad King2017-08-031-0/+1
| | | | | | | | | | | | | | | | 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
* | Merge topic 'add-package_root-to-find_package'Brad King2017-08-0414-461/+940
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4a207116 find_package: Split PACKAGE_ROOT tests to work with smaller regex 9722ff5a find_package: Fix PACKAGE_ROOT test to check find_pacakge(CONFIG) mode. c5d2b99c find_package: Add missing PACKAGE_ROOT_PATH search path implementation. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1082
| * | find_package: Split PACKAGE_ROOT tests to work with smaller regexChuck Atkins2017-08-027-846/+872
| | |
| * | find_package: Fix PACKAGE_ROOT test to check find_pacakge(CONFIG) mode.Chuck Atkins2017-07-287-99/+531
| | |
| * | find_package: Add missing PACKAGE_ROOT_PATH search path implementation.Chuck Atkins2017-07-282-0/+21
| |/
* | CMake Nightly Date StampKitware Robot2017-08-041-1/+1
| |
* | Merge topic 'doc-buildsystem-fix'Brad King2017-08-031-1/+1
|\ \ | | | | | | | | | | | | | | | | | | cc78ff72 Help: Fix example in cmake-buildsystem(7) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1097
| * | Help: Fix example in cmake-buildsystem(7) manualSebastian Nagel2017-08-021-1/+1
| | | | | | | | | | | | | | | In the example code `serialization` is a PRIVATE dependency of `archiveExtras` and not of `archive`. Fix the corresponding prose.
* | | Merge branch 'release-3.9'Brad King2017-08-030-0/+0
|\ \ \
| * \ \ Merge branch 'server-fix-crash' into release-3.9Brad King2017-08-021-1/+3
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1096
| * \ \ \ Merge branch 'UseSWIG-Java-enabled' into release-3.9Brad King2017-08-021-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1095
* | \ \ \ \ Merge topic 'server-fix-crash'Brad King2017-08-031-1/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 70272f3c server: Fix crash on missing cache entries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1096
| * | | | | server: Fix crash on missing cache entriesLaurent Rineau2017-08-021-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | Test for nullptr before constructing std::string.
* | | | | Merge topic 'UseSWIG-Java-enabled'Brad King2017-08-031-2/+4
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | b4fbf677 UseSWIG: Fix when Java is enabled as a language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1095
| * | | | UseSWIG: Fix when Java is enabled as a languageBrad King2017-08-021-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | CMake Nightly Date StampKitware Robot2017-08-031-1/+1
| | | |
* | | | Merge topic 'autogen-depends'Craig Scott2017-08-027-45/+128
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Autogen: Add AUTOMOC test for target dependencies forwardingSebastian Holtermann2017-08-016-33/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Autogen: Forward target dependencies to *_autogen targetSebastian Holtermann2017-07-281-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'FindLibXml2-compat'Brad King2017-08-021-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1a77565 FindLibXml2: Restore compatibility with projects setting LIBXML2_LIBRARIES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1094
| * | | | | FindLibXml2: Restore compatibility with projects setting LIBXML2_LIBRARIESBrad King2017-08-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'update-libarchive'Brad King2017-08-0265-2761/+4372
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | libarchive: Fix inclusion of zlib, bzlib, and lzma for build within CMakeBrad King2017-07-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update a new source file imported from libarchive upstream to include the headers for compression libraries using the CMake wrappers.
| * | | | | | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-07-2064-2760/+4371
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2017-07-09 (98a69539)
| | * | | | | | LibArchive 2017-07-09 (98a69539)LibArchive Upstream2017-07-2064-2761/+4373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 98a695399e8e7420635a5448aecde8b0a82fb83a (v3.3.2).
| * | | | | | | libarchive: Update script to get 3.3.2Brad King2017-07-201-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.9'Brad King2017-08-020-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'FindJava-fix-1.6-registry' into release-3.9Brad King2017-08-021-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1079
| * \ \ \ \ \ \ \ Merge branch 'sphinx-pre-1.2' into release-3.9Brad King2017-08-021-2/+15
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1089
* | \ \ \ \ \ \ \ \ Merge topic 'FindJava-fix-1.6-registry'Brad King2017-08-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5479074b FindJava: fix hint for windows jre 1.6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1079
| * | | | | | | | | FindJava: fix hint for windows jre 1.6Rechi Rechi2017-08-021-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in commit v3.8.0-rc1~112^2 (FindJava: add hints for jre, 2017-01-11).
* | | | | | | | | Merge topic 'sphinx-pre-1.2'Brad King2017-08-021-2/+15
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a68ff7f Utilities/Sphinx: Restore compatibility with Sphinx pre-1.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1089
| * | | | | | | | Utilities/Sphinx: Restore compatibility with Sphinx pre-1.2Björn Esser2017-08-021-2/+15
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge branch 'release-3.9'Brad King2017-08-020-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'FindJava_earlyAccessDebian' into release-3.9Craig Scott2017-08-021-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested-by: Felix Geyer <debfx@fobos.de> Merge-request: !1080
| * \ \ \ \ \ \ \ Merge branch 'FindBoost-fix-early-return' into release-3.9Craig Scott2017-08-021-0/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | Merge-request: !1078
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-08-021-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-08-011-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-07-311-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-07-301-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-07-291-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'FindMatlab/CUSTOM_TEST_COMMAND-documentation-fix'Craig Scott2017-07-291-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a9c4aeb FindMatlab: CUSTOM_TEST_COMMAND documentation fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1086
| * | | | | | | | | FindMatlab: CUSTOM_TEST_COMMAND documentation fixRaffi Enficiaud2017-07-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation states CUSTOM_MATLAB_COMMAND, while code uses CUSTOM_TEST_COMMAND. Addresses issue #17107
* | | | | | | | | | Merge topic 'FindJava_earlyAccessDebian'Craig Scott2017-07-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Allow early access version trailing string to be mixed caseCraig Scott2017-07-251-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original regex was expecting to match strings like "ea", but it has been reported that other strings like "Debian" are also possible.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-07-281-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'FindBoost'Craig Scott2017-07-271-0/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eddbd62d FindBoost: pop policy stack before returning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1078
| * | | | | | | FindBoost: pop policy stack before returningCristian Adam2017-07-261-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake would give a fatal error if the policy stack was cleaned up upon exiting the module.
* | | | | | | Merge topic 'autogen-tests-split'Craig Scott2017-07-2739-206/+322
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e434fcf Autogen: Move repeated tests to new QtAutogenRerun test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1075
generated by cgit v0.12 at 2025-01-14 06:13:30 (GMT)