mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 22:30:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,544 Commits 2 Branches 401 Tags
e746f1dc06226a6d8d8cd4eded6beba86fbed774
Commit Graph

1046 Commits

Author SHA1 Message Date
Brad King f4e4b41a19 Merge topic 'pch-ios-multi-arch' 
f593b354da PCH: Add support for multi architecture iOS projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4561
 2020-04-03 07:05:11 -04:00
Cristian Adam f593b354da PCH: Add support for multi architecture iOS projects 
Fixes: #20497
 2020-04-02 11:51:19 -04:00
Brad King e95d274f30 Merge topic 'cmprop-makefile' 
aba23c747b cmMakefile::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4559
 2020-04-02 11:20:46 -04:00
Vitaly Stakhovsky aba23c747b cmMakefile::GetProperty: return cmProp 2020-04-01 10:56:34 -04:00
Brad King ff02a592bc cmLocalGenerator: Avoid using upper-case config when not necessary 
Calls to `GetLinkerLanguage`, `GetSourceFiles`, etc. can accept
the original-case config name.
 2020-04-01 10:56:00 -04:00
Brad King a4b76c237d cmLocalGenerator: Clarify local variable name in GetTargetFlags 2020-04-01 10:55:59 -04:00
Brad King 25a920e827 cmLocalGenerator: Convert GetStaticLibraryFlags to take original-case config 
Move upper-case conversion of the configuration into the implementation.
 2020-04-01 10:55:59 -04:00
Brad King 16053df54e Merge topic 'link-libs-config-case' 
2af18704fd Merge branch 'backport-3.16-link-libs-config-case'
3f976bf201 target_link_libraries: Fix regression in case of $<CONFIG> genex
5a95b5e091 target_link_libraries: Fix regression in case of $<CONFIG> genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4544
 2020-03-31 09:19:42 -04:00
Brad King 3f976bf201 target_link_libraries: Fix regression in case of $<CONFIG> genex 
Since commit b8626261e9 (Precompile headers: Add methods to generate PCH
sources, 2019-07-13, v3.16.0-rc1~182^2~4) we look up source files for a
target using an upper-case configuration even though an original-case
name is sufficient.  Since commit 36ded610af (PCH: Generate sources
during Compute step, 2019-10-05, v3.16.0-rc1~2^2) the source file lookup
is the first time we compute many on-demand structures that depend on
the configuration name.  This caused the `$<CONFIG>` generator
expression to evaluate to the upper-case configuration name in some
cases where we used original-case before.

Fix this by switching the source file lookup to the original-case config
name.  Add a test covering the symptom that led to the discovery of this
problem.

Fixes: #20517
 2020-03-30 11:33:55 -04:00
Vitaly Stakhovsky a4255ecf81 cmStateDirectory::GetProperty: return cmProp 2020-03-27 12:33:04 -04:00
Brad King 6a0c1726e0 Merge topic 'cleanup-endls-2' 
1e4b5c7d09 Refactor: Avoid `std::endl` where it's not necessary (part 2)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4514
 2020-03-26 09:18:25 -04:00
Brad King 6257d43ffd Merge topic 'compile-commands-collapse-whitespace' 
e565053bce Ninja: Remove unnecessary newlines in compile commands
5d4bab500e Avoid consecutive whitespace in rules
d8622fbd0f Modules: Collapse consecutive whitespace in strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4512
 2020-03-26 09:13:45 -04:00
Brad King 12b39aef75 Remove redundant calls to CollapseFullPath 
Remove calls where it is known the input is already a collapsed
full path.
 2020-03-24 10:10:06 -04:00
Alex Turbov 1e4b5c7d09 Refactor: Avoid std::endl where it's not necessary (part 2) 
The `std::endl` manipulator, except inserting `\n` character, also
performs `os.flush()`, which may lead to undesired effects (like
disk I/O in the middle of forming data strings). For the
`std::stringstream` it also has no meaning.

* replace multiple `operator<<` calls on a string literal w/
  the only call and the only (bigger) string literal;
* replace one character string literal used in `operator<<`
  w/ a char literal.
 2020-03-24 21:32:05 +08:00
Daan De Meyer 5d4bab500e Avoid consecutive whitespace in rules 2020-03-23 21:34:19 +01:00
Vitaly Stakhovsky cbbca9ee2a Convert more loops to range-based for-loops 2020-03-10 14:25:56 -04:00
Vitaly Stakhovsky bbc07e4561 Source: use std::string in place of const char* 2020-01-29 14:31:01 -05:00
Brad King 08699cec68 add_custom_command: Fix dependency on macOS framework target 
When the `DEPENDS` option names a logical target name, convert to the
"real" path of that target rather than any of the symlink-provided
alternative file names.  This makes the dependencies consistent with the
outputs named by link rules producing the target artifacts.

Fixes: #20264
 2020-01-24 11:29:45 -05:00
Vitaly Stakhovsky 5e54b0cf2f cmInstallGenerator: std::string params 
Several construction parameters converted to std::string
Also made a few class members const
 2020-01-21 11:09:35 -05:00
Vitaly Stakhovsky 9db532f44d cmInstall*Generator: std::string params 
Several construction parameters converted to std::string
Also made a few class members const
 2020-01-21 09:19:13 -05:00
Brad King 941c09616b Merge topic 'multi-ninja-pch' 
a55df20499 Multi-Ninja: Add precompile headers support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4201
 2020-01-20 11:59:28 -05:00
Brad King 56a3e84a67 Merge topic 'realpath-cache' 
9d5a554cc9 cmGlobalGenerator: Add cache for realpath() results

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4220
 2020-01-20 11:55:04 -05:00
Brad King 9b9dfacaa5 Merge topic 'acc-fix-in-source-depends-path' 
ba3a417dce Tests/CustomCommand: add a test for depending on a `./path`
e23475dc73 Tests/CustomCommand: fix custom command line to actually make its output
db4780d584 cmGeneratorTarget: search for relative paths to the binary directory
ec479f101f cmLocalGenerator: collapse the path after construction
fd0ba705ce add_custom_command: check if a relative path should be an in-source path
fd84f510f8 cmLocalGenerator: simplify the current source dir query

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4195
 2020-01-20 11:52:00 -05:00
Craig Scott 6bd07b9de1 Merge topic 'pch-msvc-no-path-repetition' 
07fe1bcd4e PCH: No repeated path for internal generated PCH files (MSVC case)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4236
 2020-01-19 15:10:17 -05:00
Cristian Adam a55df20499 Multi-Ninja: Add precompile headers support 
Fixes: #19789
 2020-01-17 23:17:35 +01:00
Ben Boeckel ec479f101f cmLocalGenerator: collapse the path after construction 
The path may contain `..` or `.` components naïvely, so compute them out
before letting the generator handle them.
 2020-01-16 13:56:30 -05:00
Ben Boeckel fd0ba705ce add_custom_command: check if a relative path should be an in-source path 
This still is broken for dependencies on generated paths where they get
generated to the source directory rather than the build directory
however, but there's no way to determine that is the case.

Fixes: #20194
 2020-01-16 13:54:26 -05:00
Ben Boeckel fd84f510f8 cmLocalGenerator: simplify the current source dir query 2020-01-16 13:54:25 -05:00
Cristian Adam 07fe1bcd4e PCH: No repeated path for internal generated PCH files (MSVC case) 
Fixes: #19952
 2020-01-16 17:05:05 +01:00
Tim Blechmann 9d5a554cc9 cmGlobalGenerator: Add cache for realpath() results 
Cache the results of `realpath()` system calls in `cmGlobalGenerator`
to avoid repeating such calls for the same paths over and over.
 2020-01-16 11:29:25 +08:00
Brad King 6e6f5afd03 Merge topic 'unity-lang-filename' 
274a6f3699 Unity Build: include language in generated source file name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4223
 2020-01-15 13:37:33 -05:00
Cristian Adam 274a6f3699 Unity Build: include language in generated source file name 
Fixes: #20206
 2020-01-14 18:48:08 +01:00
Marc Chevrier f466cea3c9 cmMakefile: modernize memory management 2020-01-14 11:03:07 +01:00
Brad King 24d143e0f6 Merge topic 'objc-visibility-inlines' 
7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4199
 2020-01-13 10:22:06 -05:00
Cristian Adam 7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support 
Fixes: #20193
 2020-01-10 16:31:27 +01:00
Brad King 0607a50bb3 Merge topic 'add-header-cmext-algorithm' 
f7d12609f0 Refactoring: use append functions from cmext/algorithm
a38d04c076 Refactoring: introduce header cmext/algorithm with append functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4131
 2019-12-18 09:32:03 -05:00
Brad King 64e2891cbd Merge topic 'stdstring-target' 
c34b4497f8 cmTarget: add std::string overloads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4137
 2019-12-17 11:09:20 -05:00
Brad King 671ed5b123 Merge topic 'fat-ios' 
a9b41195d2 Handle multi-arch sysroots on Apple platforms
372c89ea38 Refactor -arch and -isysroot code usage
7a44e16d7f Refactor SDK name to path into a function
777d364913 Use xcrun instead of xcodebuild for resolving SDK path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4125
 2019-12-17 11:07:09 -05:00
Marc Chevrier f7d12609f0 Refactoring: use append functions from cmext/algorithm 2019-12-17 10:44:02 +01:00
Vitaly Stakhovsky c34b4497f8 cmTarget: add std::string overloads 2019-12-14 09:30:28 -05:00
Kyle Edwards 5a8a9f7229 Ninja: Add multi-config variant 
Co-Authored-by: vector-of-bool <vectorofbool@gmail.com>
 2019-12-13 10:51:46 -05:00
Tor Arne Vestbø a9b41195d2 Handle multi-arch sysroots on Apple platforms 2019-12-13 16:35:38 +01:00
Cristian Adam 372c89ea38 Refactor -arch and -isysroot code usage 2019-12-11 12:45:16 +01:00
Robert Maynard 2467a2b318 CUDA: Add cuda meta-features (e.g. `cuda_std_11`) support 2019-12-10 17:56:48 -05:00
Brad King 21ba61c50c Merge topic 'unity-object-libraries' into release-3.16 
fa93b4a59b Unity: Proper handling of object libraries
5ae07e7166 Unity: Generic source file handling for all generators
f742f7ac1f Unity/PCH: Skip more target types when adding automatic sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4110
 2019-12-09 10:16:31 -05:00
Brad King bde1bc7386 Merge topic 'unity-object-libraries' 
fc99130752 Merge branch 'backport-unity-object-libraries' into unity-object-libraries
fa93b4a59b Unity: Proper handling of object libraries
5ae07e7166 Unity: Generic source file handling for all generators
f742f7ac1f Unity/PCH: Skip more target types when adding automatic sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4110
 2019-12-09 10:16:31 -05:00
Brad King 47c6b6cdee Merge topic 'pch-reuse-importlib' into release-3.16 
93becd61d1 PCH: Use the target's PREFIX for building the pdb file name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4114
 2019-12-09 10:15:19 -05:00
Brad King 835f1bcbde Merge topic 'pch-reuse-importlib' 
93becd61d1 PCH: Use the target's PREFIX for building the pdb file name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4114
 2019-12-09 10:15:19 -05:00
Cristian Adam 93becd61d1 PCH: Use the target's PREFIX for building the pdb file name 
Also copy the REUSE_FROM pdb file only if the file is newer than the
existing one.

Fixes: #19731
Fixes: #20068
 2019-12-08 20:22:34 +01:00
Brad King fc99130752 Merge branch 'backport-unity-object-libraries' into unity-object-libraries 2019-12-08 11:21:38 -05:00