summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* list(): add `JOIN` sub-commandMarc Chevrier2018-03-2016-0/+93
|
* Merge branch 'release-3.11'Brad King2018-03-190-0/+0
|\
| * Merge branch 'revert-findqt4-dirs-fix' into release-3.11Brad King2018-03-191-12/+1
| |\ | | | | | | | | | Merge-request: !1867
* | \ Merge topic 'revert-findqt4-dirs-fix'Brad King2018-03-191-12/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | cf06962d73 FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1867
| * | FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty"Brad King2018-03-191-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.11.0-rc1~306^2 (FindQt4: Set PLUGINS and IMPORTS dir even if empty, 2017-11-19) regressed existing builds on some machines. Revert it for CMake 3.11 pending further investigation. Fixes: #17814, #17817 Issue: #14155, #17492
* | | Merge topic 'find-package_root-restore'Brad King2018-03-1926-61/+255
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eb35d8884b find_package: Use PackageName_ROOT variables as search prefixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1858
| * | | 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 'doc-list-command'Brad King2018-03-191-43/+126
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81226c73a4 Help: refresh list() command documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1860
| * | | | Help: refresh list() command documentationMarc Chevrier2018-03-161-43/+126
| | | | | | | | | | | | | | | | | | | | | | | | | Reformat `list` command documentation be consistent with the `string` command.
* | | | | Merge topic 'export-properties'Brad King2018-03-1920-0/+160
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6db61f0725 Export: allow exporting of additional properties Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1834
| * | | | | Export: allow exporting of additional propertiesWouter Klouwen2018-03-1620-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces an additional property that may be set on a target to allow additional properties to be exported. Normally only a limited number of properties are exported. Additional properties may be exported by simply setting the `EXPORT_PROPERTIES` property on a target that is exported.
* | | | | | Merge topic 'codelite-project-settings'Brad King2018-03-191-4/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 334c8ba7a4 CodeLite: Prefer CMAKE_RUNTIME_OUTPUT_DIRECTORY for output path acd322ebe4 CodeLite: Use project Makefile instead of workspace Makefile. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1840
| * | | | | | CodeLite: Prefer CMAKE_RUNTIME_OUTPUT_DIRECTORY for output pathTobias R. Henle2018-03-141-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the deprecated `EXECUTABLE_OUTPUT_PATH` as a fallback.
| * | | | | | CodeLite: Use project Makefile instead of workspace Makefile.Tobias R. Henle2018-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the selected project Makefile instead of the global workspace Makefile during build of a project.
* | | | | | | Merge topic 'vs-debugger-command'Brad King2018-03-197-0/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a7113d8fb VS: Add target property VS_DEBUGGER_COMMAND Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1842
| * | | | | | | VS: Add target property VS_DEBUGGER_COMMANDHannes Mezger2018-03-147-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17819
* | | | | | | | Merge topic 'vs10-cmelem'Brad King2018-03-192-72/+83
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a74d5a5c8b cmVisualStudio10TargetGenerator: improved XML nesting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1849
| * | | | | | | | cmVisualStudio10TargetGenerator: improved XML nestingVitaly Stakhovsky2018-03-162-72/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce an `Elem` helper class to track XML element state. This simplifies code in a few places, particularly OutputSourceSpecificFlags.
* | | | | | | | | Merge branch 'release-3.11'Brad King2018-03-190-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'intel-initializer-list' into release-3.11Brad King2018-03-162-5/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1855
* | \ \ \ \ \ \ \ \ Merge topic 'intel-initializer-list'Brad King2018-03-192-5/+7
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fc96d99c3e Features: Record initializer list support for Intel 14 and above Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1855
| * | | | | | | | | Features: Record initializer list support for Intel 14 and aboveBrad King2018-03-162-5/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features recorded by commit v3.6.0-rc1~120^2~5 (Features: Record standards and features for Intel C++ on UNIX, 2016-04-28) for the Intel compiler left out initializer list support because our test case in `Tests/CompileFeatures/cxx_generalized_initializers.cpp` caused an internal compiler error. It turns out this is because the Intel compiler asserts the `initializer_list` constructor signatures to verify that they match its own `<initializer_list>` header. It was our dummy implementation used to test the language feature without any headers that caused the ICE. Revise it to use a constructor signature accepted by the Intel compiler. Fixes: #17829
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-191-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-181-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'project-homepage-url'Craig Scott2018-03-1722-16/+180
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73f9b2974c project: Add HOMEPAGE_URL named parameter fd28c382b4 project: Add <PROJECT-NAME>_DESCRIPTION 9b57cb62ea Help: Fix minor typo in docs for CMAKE_PROJECT_DESCRIPTION c89993d529 Tests: Avoid enabling languages unnecessarily in RunCMake.project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1816
| * | | | | | | | | project: Add HOMEPAGE_URL named parameterAlex Turbov2018-03-1619-11/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets variables like PROJECT_HOMEPAGE_URL, which can be used as default values for various things (packaging modules, doxygen defaults, etc.). Some packaging modules have been updated to do this as part of this commit. Co-Author: Craig Scott <craig.scott@crascit.com>
| * | | | | | | | | project: Add <PROJECT-NAME>_DESCRIPTIONCraig Scott2018-03-164-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For consistency with the VERSION keyword, also define the <PROJECT-NAME>_DESCRIPTION variable.
| * | | | | | | | | Help: Fix minor typo in docs for CMAKE_PROJECT_DESCRIPTIONCraig Scott2018-03-161-1/+1
| | | | | | | | | |
| * | | | | | | | | Tests: Avoid enabling languages unnecessarily in RunCMake.projectBrad King2018-03-151-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.10'Brad King2018-03-160-0/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CMake 3.10.3v3.10.3Brad King2018-03-161-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'release-3.11'Brad King2018-03-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'gtest_discover_tests_timeout' into release-3.11Brad King2018-03-1615-16/+145
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1851
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.10'Brad King2018-03-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'gtest_discover_tests_timeout' into release-3.10Brad King2018-03-1515-16/+145
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Merge-request: !1851
* | | | | | | | | | | | Merge topic 'gtest_discover_tests_timeout'Brad King2018-03-1615-16/+145
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96fdde26bb GoogleTest: Rename TIMEOUT parameter to avoid clash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1851
| * | | | | | | | | | GoogleTest: Rename TIMEOUT parameter to avoid clashCraig Scott2018-03-1515-16/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In gtest_discover_tests(), the TIMEOUT keyword was making it impossible to set the TIMEOUT test property via the PROPERTIES keyword. This would be a frequent case, but it doesn't complain and instead silently does something different to what would normally be expected. The TIMEOUT keyword has been renamed to DISCOVERY_TIMEOUT, thereby removing the clash. This is a breaking change. 3.10.1 and 3.10.2 were the only versions that supported the TIMEOUT keyword and uses of it were likely not working as intended. Fixes: #17801
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-161-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | 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.
generated by cgit v0.12 at 2024-11-15 20:51:36 (GMT)