summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmVisualStudio10TargetGenerator: use std::string for tagVitaly Stakhovsky2019-11-106-24/+25
|
* CMake Nightly Date StampKitware Robot2019-11-101-1/+1
|
* CMake Nightly Date StampKitware Robot2019-11-091-1/+1
|
* Merge branch 'release-3.16'Brad King2019-11-080-0/+0
|\
| * Merge topic 'CTestCoverageCollectGCOV-typo' into release-3.16Brad King2019-11-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | a7d9c5e78b CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4016
* | \ Merge topic 'CTestCoverageCollectGCOV-typo'Brad King2019-11-081-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | a7d9c5e78b CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4016
| * | CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docsBrad King2019-11-081-1/+1
| | | | | | | | | | | | | | | | | | Docs added by commit f3e0b6f1eb (CTestCoverageCollectGCOV: Add module to run gcov, 2015-01-14, v3.2.0-rc1~79^2) accidentally called the function `cdash_coverage_collect_gcov`. Rename `cdash` to `ctest`.
* | | Merge branch 'release-3.16'Brad King2019-11-080-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'doc-pch-genex' into release-3.16Brad King2019-11-081-0/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | f35df783b5 Help: Document target_precompile_headers genex with angle brackets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4015
* | \ \ Merge topic 'doc-pch-genex'Brad King2019-11-081-0/+11
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | f35df783b5 Help: Document target_precompile_headers genex with angle brackets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4015
| * | | Help: Document target_precompile_headers genex with angle bracketsBrad King2019-11-081-0/+11
| | |/ | |/| | | | | | | | | | | | | | | | When passing a `<header>` inside a generator expression, the closing `>` needs to be encoded as `$<ANGLE-R>`. Add an example to the docs. Fixes: #19940
* | | Merge topic 'openssl-pkg-config-directories'Brad King2019-11-081-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 24d52daf49 FindOpenSSL: Lookup all pkg-config directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4010
| * | | FindOpenSSL: Lookup all pkg-config directoriesDenis Thulin2019-11-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a custom sysroot to build things using pkg-config, some of the output variables feature the sysroot while others do not: ```console $ export PKG_CONFIG_SYSROOT_DIR=/path/to/sysroot $ export PKG_CONFIG_LIBDIR=/path/to/sysroot/usr/lib/pkgconfig $ pkg-config --cflags-only-I openssl -I/path/to/sysroot/usr/include/ $ pkg-config --variable=includedir openssl /usr/include $ pkg-config --libs-only-L openssl -L/path/to/sysroot/usr/lib $ pkg-config --variable=libdir openssl /usr/lib ``` When using `pkg_check_modules`, it's pretty much the same: ```cmake pkg_check_modules(_OPENSSL QUIET openssl) _OPENSSL_INCLUDE_DIRS == /path/to/sysroot/usr/include/ _OPENSSL_INCLUDEDIR == /usr/include _OPENSSL_LIBRARY_DIRS == -L/path/to/sysroot/usr/lib _OPENSSL_LIBDIR == /usr/lib ``` However, FindOpenSSL only searches for headers in `INCLUDEDIR` and libraries in `LIBDIR` instead of searching `INCLUDE_DIRS` and `LIBRARY_DIRS` as well. This fixes that behaviour. Fixes: #16885 Signed-off-by: Denis Thulin <denis.thulin@enyx.fr>
* | | | Merge branch 'release-3.16'Brad King2019-11-080-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'revert-FindBinUtils-ask-compiler' into release-3.16Brad King2019-11-082-75/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2857514b0 FindBinUtils: Revert "Use the compiler to get the path to compiler tools" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4009
* | \ \ \ Merge topic 'revert-FindBinUtils-ask-compiler'Brad King2019-11-082-75/+21
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | b2857514b0 FindBinUtils: Revert "Use the compiler to get the path to compiler tools" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4009
| * | | | FindBinUtils: Revert "Use the compiler to get the path to compiler tools"Brad King2019-11-072-75/+21
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit b2fd479df5 (FindBinUtils: Use the compiler to get the path to compiler tools, 2019-09-22, v3.16.0-rc1~51^2). The compiler's answer may incorrectly come from the `PATH`. Another approach will be needed. Fixes: #19934
* | | | CMake Nightly Date StampKitware Robot2019-11-081-1/+1
| | | |
* | | | Merge branch 'release-3.16'Kyle Edwards2019-11-070-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'ctest-resource-groups' into release-3.16Kyle Edwards2019-11-07141-1051/+1062
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1435d9812 Help: Fix error in resource allocation example eb9d945f14 CTest: Rename hardware -> resources for RunCMake tests c544cb6698 CTest: Rename hardware -> resources for source code 6ce27d3a2e cmCTestMultiProcessHandler: Rename resource locking functions a7c1e15cc4 CTest: Rename hardware -> resources for CMake variables, command options 73a40b19ff CTest: Rename "Processes" lexer to "ResourceGroups" af9ed543b0 CTest: Rename PROCESSES test property to RESOURCE_GROUPS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3994
* | \ \ \ Merge topic 'ctest-resource-groups'Kyle Edwards2019-11-07141-1051/+1062
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 016601e5e6 Merge branch 'backport-ctest-resource-groups' c1435d9812 Help: Fix error in resource allocation example eb9d945f14 CTest: Rename hardware -> resources for RunCMake tests c544cb6698 CTest: Rename hardware -> resources for source code 6ce27d3a2e cmCTestMultiProcessHandler: Rename resource locking functions a7c1e15cc4 CTest: Rename hardware -> resources for CMake variables, command options 73a40b19ff CTest: Rename "Processes" lexer to "ResourceGroups" af9ed543b0 CTest: Rename PROCESSES test property to RESOURCE_GROUPS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3994
| * \ \ \ \ Merge branch 'backport-ctest-resource-groups'Brad King2019-11-05141-1051/+1062
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Help: Fix error in resource allocation exampleKyle Edwards2019-11-051-2/+2
| | | | | |
| | * | | | CTest: Rename hardware -> resources for RunCMake testsCraig Scott2019-11-0584-287/+287
| | | | | | | | | | | | | | | | | | Also includes variants like hw -> res
| | * | | | CTest: Rename hardware -> resources for source codeCraig Scott2019-11-0538-252/+257
| | | | | |
| | * | | | cmCTestMultiProcessHandler: Rename resource locking functionsCraig Scott2019-11-052-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming these ahead of other refactoring which will use the previous names. The previous names more accurately reflect their purpose after this commit anyway (talking about locking and unlocking rather than allocating and deallocating).
| | * | | | CTest: Rename hardware -> resources for CMake variables, command optionsCraig Scott2019-11-0513-60/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only changes the user-visible effects of renaming hardware allocation to resource allocation. Code changes are the minimum needed to achieve that.
| | * | | | CTest: Rename "Processes" lexer to "ResourceGroups"Brad King2019-11-0510-299/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The corresponding test property `PROCESSES` has been renamed to `RESOURCE_GROUPS`.
| | * | | | CTest: Rename PROCESSES test property to RESOURCE_GROUPSBrad King2019-11-0516-206/+213
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `PROCESSES` test property name added for CMake 3.16 is too close to the existing `PROCESSORS` test property. Furthermore, the property in principle specifies groups of resources organized in a way that is meaningful to a particular test. The groups may often correspond to processes but they could have other meanings. Since the property name `PROCESSES` has not been in a final 3.16 release yet, simply rename it to `RESOURCE_GROUPS`. Fixes: #19914
* | | | | Merge topic 'refactor-foreach'Brad King2019-11-076-71/+189
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53227a4ff2 Refactor: Modernize `foreach` code and fix some bugs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3986
| * | | | | Refactor: Modernize `foreach` code and fix some bugsAlex Turbov2019-11-066-71/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix the typo in `foreach` documentation - fix broken `foreach(... IN ITEMS ... LISTS ...)` - add tests of `foreach` for existed functionality and fixes
* | | | | | Merge branch 'release-3.16'Brad King2019-11-070-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'unity-include-generated' into release-3.16Brad King2019-11-074-11/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ddf462304 Unity build: Include GENERATED files into unity build Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Julien Schueller <schueller@phimeca.com> Merge-request: !4001
* | \ \ \ \ \ Merge topic 'unity-include-generated'Brad King2019-11-074-11/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ddf462304 Unity build: Include GENERATED files into unity build Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Julien Schueller <schueller@phimeca.com> Merge-request: !4001
| * | | | | | Unity build: Include GENERATED files into unity buildCristian Adam2019-11-064-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to skip the generated files, in case of problems one can use the SKIP_UNITY_BUILD_INCLUSION property. Fixes: #19925
* | | | | | | Merge branch 'release-3.16'Brad King2019-11-070-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'llvm-rc-fix' into release-3.16Brad King2019-11-071-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0c00bec1d CMakeVersion.rc: Fix build with llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4003
* | \ \ \ \ \ \ Merge topic 'llvm-rc-fix'Brad King2019-11-071-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0c00bec1d CMakeVersion.rc: Fix build with llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4003
| * | | | | | | CMakeVersion.rc: Fix build with llvm-rcCristian Adam2019-11-061-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | llvm-rc expects versioning as having four items, it fails otherwise.
* | | | | | | Merge branch 'release-3.16'Brad King2019-11-070-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'objc-x-objc' into release-3.16Brad King2019-11-072-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a7b4f47aa ObjC: Mark explicitly the language for compilation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4002
* | \ \ \ \ \ \ Merge topic 'objc-x-objc'Brad King2019-11-072-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a7b4f47aa ObjC: Mark explicitly the language for compilation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4002
| * | | | | | | ObjC: Mark explicitly the language for compilationCristian Adam2019-11-062-2/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way you can have .cpp files compiled as ObjC++. Fixes: #19926
* | | | | | | Merge branch 'release-3.15'Brad King2019-11-070-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-FindBoost-meta-component-ALL' into release-3.15Brad King2019-11-071-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4008
| * \ \ \ \ \ \ \ Merge branch 'backport-findpostgres-10-and-older' into release-3.15Brad King2019-11-072-8/+28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4007
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.14'Brad King2019-11-070-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-findpostgres-10-and-older' into release-3.14Brad King2019-11-072-8/+28
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | Merge-request: !4007
* | | | | | | | | | | Merge topic 'backport-FindBoost-meta-component-ALL'Brad King2019-11-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0faeb6a428 FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4008
| * | | | | | | | | | FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73Deniz Bahadir2019-11-071-0/+3
| | |_|/ / / / / / / | |/| | | | | | | |