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,887 Commits 2 Branches 401 Tags
3bc808fc3315d459a7d029645a9e892b7abcaa9a
Commit Graph

2395 Commits

Author SHA1 Message Date
Brad King e14c9af013 Merge topic 'pch-reuse-no-prop' 
bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4046
 2019-11-18 09:46:26 -05:00
Kyle Edwards 5695b0464b Merge topic 'cmake-e-rm' 
2d0100fac7 replace remove and remove_directory with rm in tests
5239fc5c75 cmake -E: Add rm with improved semantics over remove and remove_directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3949
 2019-11-15 09:57:56 -05:00
Cristian Adam bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call 
Fixes: #19970
 2019-11-15 09:47:56 -05:00
Brad King c1ae0532f3 Merge topic 'ctest_test-repeat' 
28994115e8 ctest_test: Add option to REPEAT tests
42d5d8f425 cmCTestMultiProcessHandler: Hold repeat mode as a member
ed65b3e984 CTest: Rename internal APIs for --repeat options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4011
 2019-11-15 09:17:26 -05:00
Johnny Jazeix 2d0100fac7 replace remove and remove_directory with rm in tests 2019-11-13 18:02:18 -05:00
Johnny Jazeix 5239fc5c75 cmake -E: Add rm with improved semantics over remove and remove_directory 2019-11-13 18:02:18 -05:00
Brad King 5b46bc3194 Merge topic 'unity-HEADER_FILE_ONLY' 
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:16 -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 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 43ef704d51 Merge topic 'objc-xcode-flags' 
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
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 9a935adca9 Merge topic 'pch-no-duplicates' 
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
Craig Scott 27020c81d5 Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS' 
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
Cristian Adam bb42e1ed43 ObjC: Add OBJC/OBJCXX flags to Xcode projects 
Fixes: #19936
 2019-11-11 17:43:17 +01: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 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
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
Cristian Adam 7447aa4b34 ObjC: Add try_compile support 
Fixes: #19920
 2019-11-09 11:25:32 +01:00
Brad King 28994115e8 ctest_test: Add option to REPEAT tests 2019-11-07 14:21:18 -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 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
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 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
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
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 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
Brad King 30908fa0ee Merge topic 'xcode-restore-CMakeLists' 
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
Alex Turbov 53227a4ff2 Refactor: Modernize foreach code and fix some bugs 
- fix the typo in `foreach` documentation
- fix broken `foreach(... IN ITEMS ... LISTS ...)`
- add tests of `foreach` for existed functionality and fixes
 2019-11-06 16:14:47 +02:00
Brad King 0ce8a5c08d Xcode: Fix generated references to CMakeLists.txt files 
Refactoring in commit 2d888e3390 (cmSourceFile: Rename mutating
GetFullPath() overload, 2019-08-29, v3.16.0-rc1~160^2) accidentally left
the paths to `CMakeLists.txt` files empty in generated Xcode project
files.

Fixes: #19927
 2019-11-05 14:29:41 -05:00
Brad King 016601e5e6 Merge branch 'backport-ctest-resource-groups' 2019-11-05 12:59:16 -05:00
Craig Scott eb9d945f14 CTest: Rename hardware -> resources for RunCMake tests 
Also includes variants like hw -> res
 2019-11-05 12:08:35 -05:00
Craig Scott c544cb6698 CTest: Rename hardware -> resources for source code 2019-11-05 12:08:35 -05:00
Craig Scott a7c1e15cc4 CTest: Rename hardware -> resources for CMake variables, command options 
Only changes the user-visible effects of renaming hardware
allocation to resource allocation. Code changes are the minimum
needed to achieve that.
 2019-11-05 12:08:35 -05:00
Brad King af9ed543b0 CTest: Rename PROCESSES test property to RESOURCE_GROUPS 
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
 2019-11-05 12:08:01 -05:00
Brad King 0ec60a4002 Merge branch 'source_group-tree' into release-3.16 
Merge-request: !3979
 2019-11-05 11:31:16 -05:00
Brad King cb165b8b79 Merge topic 'source_group-tree' 
3c0ca5a9d9 source_group: ensure that passed file is not a directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3979
 2019-11-05 11:30:27 -05:00
Brad King 57db062414 Merge topic 'ctest-repeat-until-pass' 
30e79bb4a3 Tests: Extend RunCMake.CTestCommandLine internal timeout for valgrind

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3987
 2019-11-05 10:55:41 -05:00
Kyle Edwards deeab72aae Tests: Add tests for INSTALL_NAME_DIR 2019-11-04 19:02:16 -05:00
Craig Scott 9667996923 Merge topic 'message-check-types' 
7b2dd9dedc Refactor: Use added message types in various modules
949a1e120a message: New message types to mark checks performed by CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3689
 2019-11-04 14:11:45 -05:00
Mateusz Janek 3c0ca5a9d9 source_group: ensure that passed file is not a directory 
Fixes: #19769
 2019-11-04 13:37:41 -05:00
Brad King 30e79bb4a3 Tests: Extend RunCMake.CTestCommandLine internal timeout for valgrind 
A case added by commit 39ac8b4eb5 (ctest: Add --repeat-after-timeout
option, 2019-10-29) includes a success-case timeout of 2 seconds.  That
is too short when running under valgrind, so extend it to 5 seconds.
 2019-11-04 11:22:58 -05:00
Brad King abac3a31a2 Merge topic 'root-dir-assertion-fix' 
0692eaf0fe ForceToRelativePath: Fix spurious assertion when local path is root dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3976
 2019-11-04 10:24:31 -05:00
Brad King 1463cfb437 Merge topic 'pgi-license-warnings' 
59673bb2dc Tests: Teach RunCMake to ignore PGI license expiry warnings
210d04bb79 CTestCustom: Suppress PGI Community Edition compiler license warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3975
 2019-11-04 10:12:26 -05:00
Alex Turbov 949a1e120a message: New message types to mark checks performed by CMake 
Closes #19638.

Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2019-11-02 14:10:09 +02:00
Craig Scott 0692eaf0fe ForceToRelativePath: Fix spurious assertion when local path is root dir 
Fixes: #19909
 2019-11-02 17:54:13 +11:00