mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,747 Commits 2 Branches 401 Tags
2dcd7ce4ba803fa4c4d27526e45e2c9cbb88e49e
Commit Graph

45747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot 2dcd7ce4ba CMake Nightly Date Stamp 2019-11-12 00:01:07 -05:00
Brad King 95555d95aa Merge branch 'release-3.16' 2019-11-11 10:25:47 -05:00
Brad King ac7f41d20e Merge topic 'objc-trycompile' 
7447aa4b34 ObjC: Add try_compile support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4006
 2019-11-11 10:25:47 -05:00
Brad King 5e328c6d74 Merge topic 'objc-trycompile' into release-3.16 
7447aa4b34 ObjC: Add try_compile support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4006
 2019-11-11 10:25:47 -05:00
Brad King 19aadc03ef Merge branch 'release-3.16' 2019-11-11 10:24:02 -05:00
Brad King 8bfd4447eb Merge topic 'objc-link-main' into release-3.16 
db91c5f776 ObjC: Set same settings for all languages supported on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4012
 2019-11-11 10:24:02 -05:00
Brad King b75882c2f7 Merge topic 'objc-link-main' 
db91c5f776 ObjC: Set same settings for all languages supported on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4012
 2019-11-11 10:24:02 -05:00
Craig Scott e3aeae7ee8 Merge topic 'doc-backport' 
75a5d1d4b1 Help/dev: Document "Backport:" footer for MR descriptions
12fd957ce3 Help/dev: Add 'external-discussion' to the main workflow status list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4004
 2019-11-11 07:28:24 -05:00
Brad King 75a5d1d4b1 Help/dev: Document "Backport:" footer for MR descriptions 2019-11-11 23:24:29 +11:00
Kitware Robot eb306700d5 CMake Nightly Date Stamp 2019-11-11 00:01:08 -05:00
Craig Scott adf863f15e Merge topic 'docs-UNITY_BUILD' into release-3.16 
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
Craig Scott 77241aafb9 Merge branch 'release-3.16' 2019-11-10 15:55:43 -05:00
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
Cristian Adam 7447aa4b34 ObjC: Add try_compile support 
Fixes: #19920
 2019-11-09 11:25:32 +01: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
Cristian Adam db91c5f776 ObjC: Set same settings for all languages supported on Darwin 
Fixes: #19928
 2019-11-08 00:50:55 +01: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