mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
45,732 Commits 2 Branches 385 Tags
b613eecfa04400779835e62089410c31a070d2de
Commit Graph

45732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott
b613eecfa0 Merge topic 'docs-UNITY_BUILD' 
fcacd8ce8d Help: Improve readability and fix inaccuracies in unity build docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4019
 2019-11-10 15:55:43 -05:00
Kitware Robot
a9c0959900 CMake Nightly Date Stamp 2019-11-10 00:01:05 -05:00
Craig Scott
fcacd8ce8d Help: Improve readability and fix inaccuracies in unity build docs 2019-11-09 19:48:34 +11:00
Kitware Robot
4523e4b326 CMake Nightly Date Stamp 2019-11-09 00:01:07 -05:00
Brad King
929d7a454c Merge topic 'CTestCoverageCollectGCOV-typo' into release-3.16 
a7d9c5e78b CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4016
 2019-11-08 14:04:17 -05:00
Brad King
c9d5f80d77 Merge branch 'release-3.16' 2019-11-08 14:04:17 -05:00
Brad King
86610c65c2 Merge topic 'CTestCoverageCollectGCOV-typo' 
a7d9c5e78b CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4016
 2019-11-08 14:04:17 -05:00
Brad King
a7d9c5e78b CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs 
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`.
 2019-11-08 11:04:32 -05:00
Brad King
11e425be9b Merge topic 'doc-pch-genex' into release-3.16 
f35df783b5 Help: Document target_precompile_headers genex with angle brackets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4015
 2019-11-08 10:36:30 -05:00
Brad King
a605a09d6e Merge branch 'release-3.16' 2019-11-08 10:36:30 -05:00
Brad King
c679138469 Merge topic 'doc-pch-genex' 
f35df783b5 Help: Document target_precompile_headers genex with angle brackets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4015
 2019-11-08 10:36:30 -05:00
Brad King
d8062b575b Merge topic 'openssl-pkg-config-directories' 
24d52daf49 FindOpenSSL: Lookup all pkg-config directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4010
 2019-11-08 09:50:15 -05:00
Brad King
f35df783b5 Help: Document target_precompile_headers genex with angle brackets 
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
 2019-11-08 09:49:26 -05:00
Brad King
0f1458022d Merge topic 'revert-FindBinUtils-ask-compiler' into release-3.16 
b2857514b0 FindBinUtils: Revert "Use the compiler to get the path to compiler tools"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4009
 2019-11-08 09:41:05 -05:00
Brad King
b115e96fff Merge branch 'release-3.16' 2019-11-08 09:41:05 -05:00
Brad King
9f7ca15de6 Merge topic 'revert-FindBinUtils-ask-compiler' 
b2857514b0 FindBinUtils: Revert "Use the compiler to get the path to compiler tools"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4009
 2019-11-08 09:41:05 -05:00
Kitware Robot
db669b4d1a CMake Nightly Date Stamp 2019-11-08 00:01:09 -05:00
Kyle Edwards
87dcbe0b21 Merge topic 'ctest-resource-groups' into release-3.16 
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
 2019-11-07 13:10:57 -05:00
Kyle Edwards
449fceeb1f Merge branch 'release-3.16' 2019-11-07 13:10:57 -05:00
Kyle Edwards
bea26f5aa0 Merge topic 'ctest-resource-groups' 
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
 2019-11-07 13:10:57 -05:00
Denis Thulin
24d52daf49 FindOpenSSL: Lookup all pkg-config directories 
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>
 2019-11-07 16:44:12 +01:00
Brad King
b2857514b0 FindBinUtils: Revert "Use the compiler to get the path to compiler tools" 
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
 2019-11-07 10:31:02 -05:00
Brad King
74569996e8 Merge topic 'refactor-foreach' 
53227a4ff2 Refactor: Modernize `foreach` code and fix some bugs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3986
 2019-11-07 10:27:59 -05:00
Brad King
d4611b05a8 Merge branch 'release-3.16' 2019-11-07 10:26:50 -05:00
Brad King
f7612a6668 Merge topic 'unity-include-generated' 
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
 2019-11-07 10:26:50 -05:00
Brad King
02ed66c04b Merge topic 'unity-include-generated' into release-3.16 
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
 2019-11-07 10:26:49 -05:00
Brad King
e1df51b19f Merge branch 'release-3.16' 2019-11-07 10:25:45 -05:00
Brad King
15feb5d3f8 Merge topic 'llvm-rc-fix' 
f0c00bec1d CMakeVersion.rc: Fix build with llvm-rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4003
 2019-11-07 10:25:45 -05:00
Brad King
0746a3398f Merge topic 'llvm-rc-fix' into release-3.16 
f0c00bec1d CMakeVersion.rc: Fix build with llvm-rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4003
 2019-11-07 10:25:44 -05:00
Brad King
5531e04472 Merge branch 'release-3.16' 2019-11-07 10:24:34 -05:00
Brad King
c2b3d0872e Merge topic 'objc-x-objc' 
9a7b4f47aa ObjC: Mark explicitly the language for compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4002
 2019-11-07 10:24:34 -05:00
Brad King
03e4fe65b0 Merge topic 'objc-x-objc' into release-3.16 
9a7b4f47aa ObjC: Mark explicitly the language for compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4002
 2019-11-07 10:24:33 -05:00
Brad King
e5b0b8560d Merge branch 'release-3.15' 2019-11-07 09:33:08 -05:00
Brad King
3dfefc1ad7 Merge branch 'release-3.14' 2019-11-07 09:32:27 -05:00
Brad King
61ce9d1769 Merge branch 'backport-FindBoost-meta-component-ALL' into release-3.15 
Merge-request: !4008
 2019-11-07 09:31:59 -05:00
Brad King
145b2d5714 Merge topic 'backport-FindBoost-meta-component-ALL' 
0faeb6a428 FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4008
 2019-11-07 09:31:38 -05:00
Deniz Bahadir
0faeb6a428 FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73 2019-11-07 09:29:54 -05:00
Brad King
f95d5bed52 Merge branch 'backport-findpostgres-10-and-older' into release-3.14 
Merge-request: !4007
 2019-11-07 09:29:27 -05:00
Brad King
4011b1be41 Merge branch 'backport-findpostgres-10-and-older' into release-3.15 
Merge-request: !4007
 2019-11-07 09:29:20 -05:00
Brad King
9493c770d5 Merge topic 'findpostgres-10-and-older' 
aeae4182cb FindPostgreSQL: support version encoding used in pre-10 releases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4007
 2019-11-07 09:26:17 -05:00
Ben Boeckel
aeae4182cb FindPostgreSQL: support version encoding used in pre-10 releases 
With the 10.x release, PostgreSQL upstream started encoding the version
as `MMmmmm` where `M` is major and `m` is minor. Prior to that, `MMmmPP`
was used where `P` was the patch number. Detect this difference and
decode it based on the used encoding.

Fixes: #19912
 2019-11-07 09:24:12 -05:00
Kitware Robot
8f3cbe3c65 CMake Nightly Date Stamp 2019-11-07 00:01:07 -05:00
Kyle Edwards
954bb6549b Merge topic 'modernize-memory-management' 
2a67ebf71b cmGeneratorTarget: modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3997
 2019-11-06 16:38:34 -05:00
Cristian Adam
7ddf462304 Unity build: Include GENERATED files into unity build 
There is no reason to skip the generated files, in case of problems
one can use the SKIP_UNITY_BUILD_INCLUSION property.

Fixes: #19925
 2019-11-06 11:47:15 -05:00
Cristian Adam
9a7b4f47aa ObjC: Mark explicitly the language for compilation 
This way you can have .cpp files compiled as ObjC++.

Fixes: #19926
 2019-11-06 16:21:45 +01:00
Cristian Adam
f0c00bec1d CMakeVersion.rc: Fix build with llvm-rc 
llvm-rc expects versioning as having four items, it fails otherwise.
 2019-11-06 10:07:01 -05:00
Brad King
ce7408514c Merge topic 'install-name-dir-genex' 
a0e2e0ca97 Help: Add documentation and release notes for INSTALL_NAME_DIR genex
deeab72aae Tests: Add tests for INSTALL_NAME_DIR
3c85f11fed INSTALL_NAME_DIR: Add support for generator expressions
2ec1156b80 Refactor: Generalize cmExportInstallFileGenerator::ReplaceInstallPrefix()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3989
 2019-11-06 09:32:22 -05:00
Brad King
0ff5bdd4c9 Merge topic 'ccmake_colored_values' 
d5d5ba3f7f ccmake: Identify the current cache entry
005aba29a1 ccmake: Improve display of the key controls
93b66735ac ccmake: Use type-based colors to display cache values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3955
 2019-11-06 09:29:22 -05:00
Brad King
0618f8b3ed Merge topic 'cpack-nsis-welcome-finish-title' 
68b5af65fa CPack/NSIS: Add options for custom welcome/finish titles + display on 3 lines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3980
 2019-11-06 09:28:05 -05:00
Brad King
ef86e8991b Merge topic 'FindBoost-meta-component-ALL' into release-3.16 
77a01c398f FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3996
 2019-11-06 09:25:43 -05:00