summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2018-10-091-1/+1
|
* Merge branch 'release-3.13'Brad King2018-10-080-0/+0
|\
| * Merge branch 'project-always-set-desc-url' into release-3.13Brad King2018-10-084-12/+37
| |\ | | | | | | | | | Merge-request: !2457
| * \ Merge branch 'add_ctest_progress_docs' into release-3.13Brad King2018-10-083-4/+32
| |\ \ | | | | | | | | | | | | Merge-request: !2454
| * \ \ Merge branch 'list-SORT-docs' into release-3.13Brad King2018-10-081-11/+15
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2453
* | \ \ \ Merge topic 'add_ctest_progress_docs'Brad King2018-10-083-4/+32
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2154ea38f9 Help: Add missing docs for the ctest --progress option fb2cdf4d4c Help: Use :envvar: links for env vars affecting ctest command Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Wegner <michael.t.wegner@gmail.com> Merge-request: !2454
| * | | | Help: Add missing docs for the ctest --progress optionCraig Scott2018-10-073-0/+28
| | | | | | | | | | | | | | | | | | | | These docs were missing from the changes that introduced the feature in !2240.
| * | | | Help: Use :envvar: links for env vars affecting ctest commandCraig Scott2018-10-071-4/+4
| | | | |
* | | | | Merge topic 'project-always-set-desc-url'Brad King2018-10-084-12/+37
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f8a086a86b project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are set b27247c8df project(): Add tests verifying variables set by second project() call Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2457
| * | | | project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are setCraig Scott2018-10-072-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a project() call does not have DESCRIPTION or HOMEPAGE_URL options, it must still set the relevant variables or else those variables will inherit values from an earlier project() call. That is inconsistent with how VERSION is handled and is likely to be unexpected. The docs were also ambiguous about what should happen in such cases.
| * | | | project(): Add tests verifying variables set by second project() callCraig Scott2018-10-072-0/+27
| |/ / /
* | | | Merge topic 'list-SORT-docs'Brad King2018-10-081-11/+15
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | cdf8d79e9f Help: Improve/fix incorrect docs for list(SORT) sub-options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2453
| * | | Help: Improve/fix incorrect docs for list(SORT) sub-optionsCraig Scott2018-10-061-11/+15
| |/ /
* | | Merge branch 'release-3.13'Brad King2018-10-080-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'UseSWIG-php-regression' into release-3.13Brad King2018-10-081-0/+4
| |\ \ | | | | | | | | | | | | Merge-request: !2448
| * \ \ Merge branch 'autogen-moc-predef-cross-compile' into release-3.13Brad King2018-10-082-0/+9
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2452
* | \ \ \ Merge branch 'release-3.12'Brad King2018-10-080-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'UseSWIG-php-regression' into release-3.12Brad King2018-10-051-0/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Merge-request: !2448
* | | | | | Merge topic 'UseSWIG-php-regression'Brad King2018-10-081-0/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ecd0fec40b UseSWIG: fix regression for PHP language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2448
| * | | | | UseSWIG: fix regression for PHP languageMarc Chevrier2018-10-051-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.12.0-rc1~481^2 (UseSWIG: modernize module, 2018-01-29) accidentally regressed support for PHP. Fix it. Fixes: #18421
* | | | | Merge topic 'autogen-moc-predef-cross-compile'Brad King2018-10-082-0/+9
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66f49d1f9a Android: Add clang --target= flag to compiler predefines command 39534c58c5 Autogen: Add clang --target= flag to compiler predefines command Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: André Klitzing <aklitzing@gmail.com> Merge-request: !2452
| * | | | Android: Add clang --target= flag to compiler predefines commandBrad King2018-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we set `CMAKE_<LANG>_COMPILER_TARGET` to the Android target architecture, add it to `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND` also. This is needed to make moc predefines aware of `__ANDROID__`. Fixes: #18425
| * | | | Autogen: Add clang --target= flag to compiler predefines commandBrad King2018-10-051-0/+8
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Respect the compiler target value `CMAKE_<LANG>_COMPILER_TARGET` in `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND`. Issue: #18425
* | | | CMake Nightly Date StampKitware Robot2018-10-081-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-10-071-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-10-061-1/+1
| | | |
* | | | Merge branch 'release-3.13'Brad King2018-10-050-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'doc-find_package-update' into release-3.13Brad King2018-10-051-35/+48
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2446
* | \ \ \ Merge topic 'doc-find_package-update'Brad King2018-10-051-35/+48
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c90f3dff82 Help: Clarify find_package Module and Config mode relation 26dac50220 Help: Remove redundant recommendation 11058a2e7c Help: Add internal section link to find_package command docs aaf5ea2d70 Help: Add section headers to find_package command 56310b0671 Help: Move find_package NO_POLICY_SCOPE to more appropriate location 336dce1c95 Help: Add table of contents to find_package command docs 463d59d331 Help: Rephrase summary in find_package command docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2446
| * | | | Help: Clarify find_package Module and Config mode relationJoachim Wuttke (l)2018-10-041-17/+17
| | | | |
| * | | | Help: Remove redundant recommendationBrad King2018-10-041-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | We suggest that users prefer the basic signature in two places. Drop the latter and move its related content to a better section.
| * | | | Help: Add internal section link to find_package command docsJoachim Wuttke (l)2018-10-041-6/+8
| | | | |
| * | | | Help: Add section headers to find_package commandJoachim Wuttke (l)2018-10-041-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | The document is pretty long but is already mostly organized into sections. Add explicit section headers.
| * | | | Help: Move find_package NO_POLICY_SCOPE to more appropriate locationJoachim Wuttke (l)2018-10-041-3/+3
| | | | |
| * | | | Help: Add table of contents to find_package command docsJoachim Wuttke (l)2018-10-041-0/+4
| | | | |
| * | | | Help: Rephrase summary in find_package command docsJoachim Wuttke (l)2018-10-041-1/+1
| | |/ / | |/| |
* | | | CMake Nightly Date StampKitware Robot2018-10-051-1/+1
| | | |
* | | | Merge branch 'release-3.13'Brad King2018-10-040-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'doc-osx-vars-as-cache' into release-3.13Brad King2018-10-041-0/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2443
* | \ \ \ Merge topic 'doc-osx-vars-as-cache'Brad King2018-10-041-0/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | bc57c32d7a Help: Document CMAKE_OSX_* variables as cache entries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2443
| * | | | Help: Document CMAKE_OSX_* variables as cache entriesJames Turner2018-10-041-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables * CMAKE_OSX_ARCHITECTURES * CMAKE_OSX_DEPLOYMENT_TARGET * CMAKE_OSX_SYSROOT should be set as cache entries. Document this explicitly.
* | | | Merge branch 'release-3.13'Brad King2018-10-040-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'pkgc-op-lt-gt' into release-3.13Brad King2018-10-044-1/+91
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2435
* | \ \ \ Merge topic 'pkgc-op-lt-gt'Brad King2018-10-044-1/+91
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | aa51bfd74f FindPkgConfig: support also > and < operators for version compares Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2435
| * | | | FindPkgConfig: support also > and < operators for version comparesRolf Eike Beer2018-10-044-1/+91
| | |/ / | |/| | | | | | | | | | Fixes: #18416
* | | | Merge branch 'release-3.13'Brad King2018-10-040-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'misc-typos' into release-3.13Brad King2018-10-049-13/+13
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2440
| * \ \ \ Merge branch 'doc-cmp0077' into release-3.13Brad King2018-10-042-6/+44
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2439
| * \ \ \ \ Merge branch 'platform-gnu' into release-3.13Brad King2018-10-041-0/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2438
* | \ \ \ \ \ Merge topic 'misc-typos'Brad King2018-10-049-13/+13
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b4c5a0365 Fix misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2440