summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* find_package: Use PackageName_ROOT variables as search prefixesBrad King2018-03-1626-61/+255
| | | | | | | | | | | | | | | | | | | This feature was originally added by commit v3.9.0-rc1~71^2~2 (find_*: Add a new PackageRoot search path group, 2017-05-03) and documented by commit v3.9.0-rc1~71^2 (find_*: Add docs for PackageRoot search path group, 2017-05-03). However, we had to disable the feature and remove the documentation in commit v3.9.1~2^2 (find_*: Disable the PACKAGE_ROOT search path group for CMake 3.9, 2017-08-08) due to breaking projects that used `PackageName_ROOT` variables themselves. Add policy `CMP0074` to restore the `PackageName_ROOT` variable behavior in a compatible way. Also revise the stack of root paths to store the paths themselves rather than the package names. This way the policy can be considered at the `find_package` call site instead of individual `find_` calls inside a find module. Co-Author: Chuck Atkins <chuck.atkins@kitware.com> Issue: #17144
* Merge topic 'clarify-contributing-doc'Brad King2018-03-151-0/+2
|\ | | | | | | | | | | | | | | 27502491dd CONTRIBUTING: Clarify choice of master or release branch as a base Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Merge-request: !1845
| * CONTRIBUTING: Clarify choice of master or release branch as a baseJean-Christophe Fillion-Robin2018-03-151-0/+2
| |
* | Merge topic 'compile-options-shell'Brad King2018-03-157-5/+73
|\ \ | | | | | | | | | | | | | | | | | | ce0b983216 target_compile_options: Add syntax to specify shell strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1841
| * | target_compile_options: Add syntax to specify shell stringsBrad King2018-03-147-5/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Options specified via `COMPILE_OPTIONS` and `INTERFACE_COMPILE_OPTIONS` are deduplicated, but individual options can legitimately be duplicated when grouped with other options, e.g. -D A -D B After deduplication that becomes `-D A B`. Therefore we need a way to treat groups of options as units during deduplication. A simple approach is to specify each group as one option, e.g. "-D A" "-D B" However, that conflicts with options that legitimately have spaces. To break this ambiguity, add a `SHELL:` prefix syntax to specify that an option should be parsed like shell command line arguments after deduplication, e.g. "SHELL:-D A" "SHELL:-D B" These will survive deduplication intact, and then be parsed to produce `-D A -D B` on the final command line. Fixes: #15826
* | | Merge branch 'release-3.11'Brad King2018-03-150-0/+0
|\ \ \
| * \ \ Merge branch 'xl-cc-default-std' into release-3.11Brad King2018-03-141-1/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1854
| * \ \ \ Merge branch 'findjni-mips-r6-new-arch' into release-3.11Brad King2018-03-141-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1853
* | \ \ \ \ Merge topic 'xl-cc-default-std'Brad King2018-03-151-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 194b74daec XL: Fix C default level detection when invoked as 'cc' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1854
| * | | | | XL: Fix C default level detection when invoked as 'cc'Brad King2018-03-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IBM XL C compiler does not define `__STDC__` when invoked as plain `cc` instead of `xlc`, so `CMAKE_C_STANDARD_COMPUTED_DEFAULT` does not get set and CMake fails. Teach CMake about the XL compiler's default C standard in this case. Fixes: #17649
* | | | | | Merge topic 'bootstrap-clarify-error'Brad King2018-03-151-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25eb6e60d7 bootstrap: Clarify error when building with invalid CXXFLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !1850
| * | | | | | bootstrap: Clarify error when building with invalid CXXFLAGSBen Chaney2018-03-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention the flags used when complaining that the compiler does not work.
* | | | | | | Merge topic 'findjni-mips-r6-new-arch'Brad King2018-03-151-1/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c92596e96 FindJNI: add some new architecture names for mips release 6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1853
| * | | | | | FindJNI: add some new architecture names for mips release 6YunQiang Su2018-03-141-1/+4
| | |/ / / / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-03-151-1/+1
| | | | | |
* | | | | | Merge topic 'cmake_project_xxx_docs'Brad King2018-03-145-10/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a2a9d107d Help: Fix incorrect CMAKE_PROJECT_xxx docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1847
| * | | | | | Help: Fix incorrect CMAKE_PROJECT_xxx docsCraig Scott2018-03-135-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs for CMAKE_PROJECT_NAME and CMAKE_PROJECT_DESCRIPTION were erroneously documenting the behavior of PROJECT_NAME and PROJECT_DESCRIPTION respectively. Fix these and update the project() docs to also mention CMAKE_PROJECT_NAME and CMAKE_PROJECT_DESCRIPTION. Fixes: #17815
* | | | | | | Merge topic 'build_and_test_mode_docs'Brad King2018-03-141-10/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b43adc45c Help: Clarify ctest build-and-test mode options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1848
| * | | | | | | Help: Clarify ctest build-and-test mode optionsCraig Scott2018-03-131-10/+14
| |/ / / / / / | | | | | | | | | | | | | | Fixes: #17807
* | | | | | | Merge topic 'doc-vs-workdir-versions'Brad King2018-03-141-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b25cc452a Help: Document VS_DEBUGGER_WORKING_DIRECTORY supported VS versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1843
| * | | | | | | Help: Document VS_DEBUGGER_WORKING_DIRECTORY supported VS versionsHannes Mezger2018-03-131-0/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-03-141-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'release-3.11'Brad King2018-03-130-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'genex-COMPILE_LANGUAGE-system-include' into release-3.11Brad King2018-03-139-25/+43
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1844
| * \ \ \ \ \ Merge branch 'ccmake-stack-smashing' into release-3.11Brad King2018-03-131-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1836
* | \ \ \ \ \ \ Merge branch 'release-3.10'Brad King2018-03-130-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ccmake-stack-smashing' into release-3.10Brad King2018-03-131-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | Merge-request: !1836
* | | | | | | | | Merge topic 'genex-COMPILE_LANGUAGE-system-include'Brad King2018-03-139-25/+43
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b5e52fd65 Genex: Fix COMPILE_LANGUAGE propagation through try_compile 2deb9b7f34 Genex: Fix COMPILE_LANGUAGE in SYSTEM include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1844
| * | | | | | | | Genex: Fix COMPILE_LANGUAGE propagation through try_compileBrad King2018-03-124-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When evaluating include directories during export to a `try_compile` test project, thread the compile language through to the generator expression evaluator so it can support `$<COMPILE_LANGUAGE:...>`. Issue: #17811
| * | | | | | | | Genex: Fix COMPILE_LANGUAGE in SYSTEM include directoriesBrad King2018-03-126-15/+29
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When evaluating `INTERFACE_SYSTEM_INCLUDE_DIRECTORIES`, or evaluating `INTERFACE_INCLUDE_DIRECTORIES` on an imported target, thread the compile language through to the generator expression evaluator so that it can support `$<COMPILE_LANGUAGE:...>`. Fixes: #17811
* | | | | | | | Merge topic 'ccmake-stack-smashing'Brad King2018-03-131-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | 7899e53691 ccmake: fix status line buffer overflow on very wide terminals Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1836
| * | | | | | ccmake: fix status line buffer overflow on very wide terminalsTianhao Chai2018-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A mistyped length calculation will memset across stack frame when the user's terminal width is larger than 270.
* | | | | | | CMake Nightly Date StampKitware Robot2018-03-131-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'release-3.11'Brad King2018-03-120-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'ep-support-passing-var-ending-with-notfound' into release-3.11Brad King2018-03-125-6/+36
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1838
| * \ \ \ \ \ Merge branch 'update-buildsystem-docs' into release-3.11Brad King2018-03-121-6/+5
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Merge-request: !1839
* | | | | | | Merge topic 'update-buildsystem-docs'Brad King2018-03-121-6/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78756429ab Help: Adapt cmake-buildsystem(7) to new IMPORTED targets features Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1839
| * | | | | | Help: Adapt cmake-buildsystem(7) to new IMPORTED targets featuresKai Wolf2018-03-121-6/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~433^2~2 (Teach target_* commands to set INTERFACE properties of IMPORTED targets, 2017-09-18) it is now possible to use the customary `target_*` commands for adjusting the settings of an IMPORTED target. Update documentation accordingly.
* | | | | | Merge topic 'ep-support-passing-var-ending-with-notfound'Brad King2018-03-125-6/+36
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ad981c8f7 ExternalProject: Fix cache generation when last args ends with "-NOTFOUND" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1838
| * | | | | ExternalProject: Fix cache generation when last args ends with "-NOTFOUND"Jean-Christophe Fillion-Robin2018-03-125-6/+36
| |/ / / /
* | | | | Merge topic 'genex-TARGET_EXISTS'Brad King2018-03-1214-0/+83
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7fec336bf7 genex: Add TARGET_EXISTS to check for target existence Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1829
| * | | | | genex: Add TARGET_EXISTS to check for target existenceAlex Turbov2018-03-0914-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define `$<TARGET_EXISTS:a>` to `1` if `a` is an existed target name, else `0`.
* | | | | | Merge topic 'xml-raii'Brad King2018-03-122-115/+130
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90086767dd cmGlobalVisualStudio10Generator: Use cmXMLWriter RAII helpers 8401b6ac4e cmXMLWriter: Add RAII helpers to allow DOM-like syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1818
| * | | | | | cmGlobalVisualStudio10Generator: Use cmXMLWriter RAII helpersVitaly Stakhovsky2018-03-092-117/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies our XML generation code and avoids the need to disable clang-format.
| * | | | | | cmXMLWriter: Add RAII helpers to allow DOM-like syntaxVitaly Stakhovsky2018-03-091-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RAII for cmXMLWriter::StartElement/EndElement to make nesting automatic.
* | | | | | | Merge topic 'update-dllplatform'Brad King2018-03-123-6/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2dc2a3eb15 Identify DLL platforms via CMAKE_IMPORT_LIBRARY_SUFFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1832
| * | | | | | | Identify DLL platforms via CMAKE_IMPORT_LIBRARY_SUFFIXStephan Szabo2018-03-093-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `CMAKE_IMPORT_LIBRARY_SUFFIX` to identify platforms that have DLL import libraries rather than memorizing a list of platform names. Fixes: #16801
* | | | | | | | Merge topic 'cmake-rc-version-decimal'Brad King2018-03-121-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 588a1afe76 CMakeVersion.rc: Avoid leading zeros in integer version components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1835
| * | | | | | | CMakeVersion.rc: Avoid leading zeros in integer version componentsBrad King2018-03-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The split in commit v3.11.0-rc1~232^2 (CMakeVersion RC file: Split patch into 2 components, 2017-12-01) can leave components "2018,0309", but the latter is an octal constant with digit "9" out of range. Strip the leading zero to express the components as "2018,309" so the resource compiler treats them as decimal.
* | | | | | | | CMake Nightly Date StampKitware Robot2018-03-121-1/+1
| | | | | | | |