mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 06:47:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,499 Commits 2 Branches 401 Tags
ff6c336127973d09ac7d20f846854bdebf384201
Commit Graph

45499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saleem Abdulrasool ff6c336127 Swift: support -rpath on Darwin 
Darwin also has the concept of RPATH.  Additionally, the flag is
identical to that on other Unixish platforms.  Simply avoid the `-rpath`
handling on Windows.

This enables the use of `BUILD_WITH_INSTALL_RPATH` and `INSTALL_RPATH`
with Swift targets on Darwin.
 2019-11-18 10:04:09 -05:00
Brad King a1216139f8 Merge topic 'swift-rpath-separator' into release-3.16 
a27a1c7e88 Swift: Allow build and installed RPATHs to differ

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4037
 2019-11-13 09:37:42 -05:00
Saleem Abdulrasool a27a1c7e88 Swift: Allow build and installed RPATHs to differ 
Define the RPATH separator to `:` so that CMake can reserve room to edit
the ELF RPATH at install time.  This enables the use of `BUILD_RPATH` and
`INSTALL_RPATH` with differing values.
 2019-11-12 10:02:06 -05:00
Kyle Edwards 28bc41ca62 Merge topic 'add_custom_command-supports-COMMAND_EXPAND_LISTS' into release-3.16 
64f40c5d09 Help: Both add_custom_command signatures support COMMAND_EXPAND_LISTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4036
 2019-11-12 10:02:01 -05:00
Brad King eae743bf17 Merge topic 'unity-HEADER_FILE_ONLY' into release-3.16 
9a5418320e Unity: Don't include sources with HEADER_FILE_ONLY property set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4023
 2019-11-12 09:51:15 -05:00
Brad King 88e0dca40d Merge topic 'objc-standard-docs' into release-3.16 
665954fa8d ObjC: Document ObjC/ObjCXX standard properties / variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4031
 2019-11-12 09:47:44 -05:00
Brad King b197d20c08 Merge topic 'objc-xcode-flags' into release-3.16 
bb42e1ed43 ObjC: Add OBJC/OBJCXX flags to Xcode projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4020
 2019-11-12 09:43:11 -05:00
Brad King c4708c5928 Merge topic 'update-expat' into release-3.16 
50bc359184 expat: Update CMake build for 2.2.9
b63a5c88a2 Merge branch 'upstream-expat' into update-expat
1712885b4f expat 2019-09-25 (a7bc26b6)
512fabaa9d expat: Update script to get Expat 2.2.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4032
 2019-11-12 09:38:21 -05:00
Brad King f90c351e60 Merge topic 'reference-IMPORTED_IMPLIB-more' into release-3.16 
2944bf46d5 Help: Reference IMPORTED_IMPLIB from the IMPORTED_LOCATION documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4034
 2019-11-12 09:36:55 -05:00
Brad King ffa9965700 Merge topic 'pch-cray-classic' into release-3.16 
77a8f9ecbc Tests: Fix ExportImport PCH expectation on Cray Classic compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4033
 2019-11-12 09:35:38 -05:00
Brad King 7a08f0d8dd Merge topic 'resolve-full-path-at-generate-time' into release-3.16 
48d1456b3d UnityBuild: Resolve full paths of unity source includes
ec2f130aa9 cmFileAPI: Resolve full path in PCH source comparison

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4029
 2019-11-12 09:34:11 -05:00
Craig Scott cba091d3a9 Merge topic 'pch-no-duplicates' into release-3.16 
e01935ac9d PCH: No repeated path for internal generated PCH files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4030
 2019-11-12 08:28:46 -05:00
Craig Scott 00f5e02060 Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS' into release-3.16 
1d1fa5d3e4 Tests: Add RunCMake.CPackCommandLine case for multi-config package
108207cc84 CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4025
 2019-11-12 08:16:31 -05:00
Brad King 1d1fa5d3e4 Tests: Add RunCMake.CPackCommandLine case for multi-config package 
In commit da5ac4bb60 (cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS`
variable, 2019-07-10, v3.16.0-rc1~165^2) we added support for running
the `cpack -C ...` command-line with multiple configurations.  Add an
explicit test for this.

Fixes: #19918
 2019-11-11 14:16:48 -05:00
Alex Turbov 108207cc84 CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS 
In commit da5ac4bb60 (cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS`
variable, 2019-07-10, v3.16.0-rc1~165^2) we added both the variable
and support for `cpack -C` with multiple configurations.  Drop the
variable because the `package` target cannot ensure that all of the
configurations are built.  Keep the command-line interface so that
it can be used manually in scripts.

Fixes: #19918
 2019-11-11 14:15:09 -05:00
Marc Aldorasi 64f40c5d09 Help: Both add_custom_command signatures support COMMAND_EXPAND_LISTS 2019-11-11 13:07:11 -05:00
Cristian Adam bb42e1ed43 ObjC: Add OBJC/OBJCXX flags to Xcode projects 
Fixes: #19936
 2019-11-11 17:43:17 +01:00
Marc Aldorasi 2944bf46d5 Help: Reference IMPORTED_IMPLIB from the IMPORTED_LOCATION documentation 
Issue: #16698
 2019-11-11 11:26:30 -05:00
Brad King 77a8f9ecbc Tests: Fix ExportImport PCH expectation on Cray Classic compiler 
Do not expect PCH-included definitions for this compiler.
 2019-11-11 11:18:35 -05:00
Brad King 50bc359184 expat: Update CMake build for 2.2.9 2019-11-11 10:44:17 -05:00
Brad King b63a5c88a2 Merge branch 'upstream-expat' into update-expat 
* upstream-expat:
  expat 2019-09-25 (a7bc26b6)
 2019-11-11 10:42:32 -05:00
Expat Upstream 1712885b4f expat 2019-09-25 (a7bc26b6) 
Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit a7bc26b69768f7fb24f0c7976fae24b157b85b13 (R_2_2_9).
 2019-11-11 10:38:19 -05:00
Brad King 512fabaa9d expat: Update script to get Expat 2.2.9 2019-11-11 10:38:13 -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 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
Cristian Adam 665954fa8d ObjC: Document ObjC/ObjCXX standard properties / variables 
Fixes: #19919
 2019-11-11 16:10:19 +01:00
Cristian Adam 9a5418320e Unity: Don't include sources with HEADER_FILE_ONLY property set 
Fixes: #19946
Fixes: #19947
Co-authored-by: Craig Scott <craig.scott@crascit.com>
 2019-11-11 14:10:18 +01:00
Cristian Adam e01935ac9d PCH: No repeated path for internal generated PCH files 
Fixes: #19952
 2019-11-11 13:21:12 +01:00
Daniel Eiband 48d1456b3d UnityBuild: Resolve full paths of unity source includes 
Issue: 19927
 2019-11-11 13:05:31 +01:00
Daniel Eiband ec2f130aa9 cmFileAPI: Resolve full path in PCH source comparison 
Issue: 19927
 2019-11-11 13:03:29 +01: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
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
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 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 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
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
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 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 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 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
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 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
Brad King bae7a82ffa Merge topic 'xcode-restore-CMakeLists' into release-3.16 
0ce8a5c08d Xcode: Fix generated references to CMakeLists.txt files
9457c95aa0 cmGlobalXCodeGenerator: Mark known source locations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3999
 2019-11-06 09:23:56 -05:00
Craig Scott e0ec13059a Merge topic 'doc-discourse' into release-3.16 
4af39fe25b CMakeSystemSpecificInformation: Replace mailing list with Discourse Forum
d0be4d5365 README: Replace link to mailing list the CMake Discourse Forum
4dd6ad20b6 README: Update links to cmake.org pages
821bfca89b Help: Replace links to mailing lists with links to our Discourse Forum
32d8de1463 CMakeCPack: Update Debian package contact email
2fae9101e5 Help/dev: Update maintainer guide for Discourse transition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3998
 2019-11-06 05:51:26 -05:00