mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
43,594 Commits 2 Branches 385 Tags
902af25512545db441043ea8f1fd2637fa1e1129
Commit Graph

43594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott
902af25512 Help: Fix typo for CTEST_CUSTOM_WARNING_xxx vars 
These variables apply to the `ctest_build` command, not `ctest_test`

Relates: #19217
 2019-05-26 22:31:23 +10:00
Kitware Robot
63f149f598 CMake Nightly Date Stamp 2019-05-26 00:01:04 -04:00
Kitware Robot
e32f839338 CMake Nightly Date Stamp 2019-05-25 00:01:11 -04:00
Brad King
4ec2b99941 Merge topic 'selective-tar-extracting-and-listing' 
c8e217e0a7 cmake: tar: Allow selective extracting and listing of archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3342
 2019-05-24 10:43:14 -04:00
Brad King
2b8e5a3ba7 Merge topic 'ninja-pool-link-doc-nit' 
25b2c7e4cd Help/CMAKE_JOB_POOL_LINK: match the header line with the variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3369
 2019-05-24 10:41:48 -04:00
Brad King
3b7894b96c Merge topic 'fix-armclang-policy' 
32e4f236b7 ARMClang: fix policy manipulation in the compiler module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3365
 2019-05-24 10:40:39 -04:00
Brad King
96189e99e1 Merge topic 'cmAppend' 
006229278b Use cmAppend to append ranges to std::vector instances
999516478d cmAlgorithms: Add cmAppend function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3366
 2019-05-24 10:39:01 -04:00
Brad King
96a013d44c Merge topic 'cmTargetMap_definition' 
7b4b61a4d3 cmMakefile: Define cmTargetMap type in cmMakefile instead of cmTarget

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3364
 2019-05-24 10:37:38 -04:00
Brad King
ff0fb58fb5 Merge topic 'update-curl' 
90766347db curl: Update build within CMake to account for 7.65 changes
a39138ef9a Merge branch 'upstream-curl' into update-curl
b26487c663 curl 2019-05-22 (885ce314)
2de8af0121 curl: Update script to get curl 7.65.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3363
 2019-05-24 10:36:24 -04:00
Ben Boeckel
25b2c7e4cd Help/CMAKE_JOB_POOL_LINK: match the header line with the variable 2019-05-24 09:31:56 -04:00
Kitware Robot
c22693b99d CMake Nightly Date Stamp 2019-05-24 00:01:06 -04:00
Sebastian Holtermann
006229278b Use cmAppend to append ranges to std::vector instances 2019-05-23 16:19:49 +02:00
Bartosz Kosiorek
c8e217e0a7 cmake: tar: Allow selective extracting and listing of archives 2019-05-23 10:08:22 -04:00
Sebastian Holtermann
999516478d cmAlgorithms: Add cmAppend function 
The new `cmAppend` function simplifies appending ranges of values to a
`std::vector`.
 2019-05-23 15:32:23 +02:00
Brad King
f03a80aefd Merge topic 'genex-target-property-lifetime' 
5a1af142f1 Genex: Fix value lifetimes in nested TARGET_PROPERTY evaluation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3362
 2019-05-23 09:22:37 -04:00
Ben Boeckel
32e4f236b7 ARMClang: fix policy manipulation in the compiler module 
Policies have their own scoping and cannot be set within a function
without affecting callers.
 2019-05-23 09:19:59 -04:00
Brad King
a4faf7788c Merge topic 'string-error' 
e884b1b693 cmSystemTools::Error(): remove const char* overload

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3360
 2019-05-23 09:05:47 -04:00
Brad King
22df62b58d Merge topic 'swift-flag-variables' 
24223ac84b Modules: add Swift MSVC_RUNTIME_LIBRARY flags
7e636fd8e0 Modules: add `CMAKE_Swift_FRAMEWORK_SEARCH_FLAG`
0fbf936b46 Modules: remove `CMAKE_INCLUDE_FLAG_SEP_Swift`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3353
 2019-05-23 09:02:55 -04:00
Brad King
4f739a4e47 Merge topic 'compiler-launcher-shell-format' 
8ee6584a99 Ninja,Makefile: Fix <LANG>_COMPILER_LAUNCHER shell command syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3361
 2019-05-23 09:01:04 -04:00
Brad King
5222400d9f Merge topic 'FindPython-find_strategy' 
8517b549f4 FindPython: Add policy to manage lookup stratgey default.
9f205acefe FindPython: Implement lookup strategies.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3354
 2019-05-23 08:59:25 -04:00
Brad King
cbd1c5b4ab Merge topic 'framework-var' 
26ea022c3b Add variable CMAKE_FRAMEWORK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3347
 2019-05-23 08:57:36 -04:00
Brad King
79c6a573f4 Merge topic 'swift-flags' 
02c14b7fcd Ninja,Swift: pass along DEFINES/FLAGS/INCLUDES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3355
 2019-05-23 08:55:16 -04:00
Brad King
d1a570f18c Merge topic 'cmFileTimes' 
5b53cfda24 cmSystemTools: Remove cmSystemToolsFileTime interface
9c576a88d9 Use cmFileTimes instead of cmSystemToolsFileTime interface
4b45a5d5c7 cmFileTimes: New RAII based cmFileTimes class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3358
 2019-05-23 08:53:17 -04:00
Brad King
d7e70d01fe Merge topic 'autogen_compiler_features' 
71d6a1455e Autogen: Evaluate compiler features for the same exectuable only once

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3359
 2019-05-23 08:51:38 -04:00
Sebastian Holtermann
7b4b61a4d3 cmMakefile: Define cmTargetMap type in cmMakefile instead of cmTarget 
The `cmTargetMap` type is only used in the context of `cmMakefile`.
Therefore it is the most appropriate place to declare it.

This moves the `cmTarget.h/cmTargets` type definition to
`cmMakefile::cmTargetMap`.
 2019-05-23 13:00:33 +02:00
Kitware Robot
22d58e07e5 CMake Nightly Date Stamp 2019-05-23 00:01:09 -04:00
Brad King
90766347db curl: Update build within CMake to account for 7.65 changes 2019-05-22 14:22:22 -04:00
Brad King
a39138ef9a Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2019-05-22 (885ce314)
 2019-05-22 14:15:06 -04:00
Curl Upstream
b26487c663 curl 2019-05-22 (885ce314) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 885ce31401b6789c959131754b1e5ae518964072 (curl-7_65_0).
 2019-05-22 14:11:40 -04:00
Brad King
2de8af0121 curl: Update script to get curl 7.65.0 2019-05-22 14:11:29 -04:00
Vitaly Stakhovsky
e884b1b693 cmSystemTools::Error(): remove const char* overload 2019-05-22 10:51:06 -04:00
Brad King
8ee6584a99 Ninja,Makefile: Fix <LANG>_COMPILER_LAUNCHER shell command syntax 
The first entry in the compiler launcher command argument list is
the command itself and should be converted to the shell's native
command syntax (e.g. backslashes on Windows).

Without this, the `RunCMake.CompilerLauncher` test fails on Windows
when there are *no* spaces in the path to `cmake.exe`.
 2019-05-22 10:47:15 -04:00
Brad King
8ed6efbbd3 Merge topic 'default-generator-env' 
d0f0ba0f7a Tests: Add environment generator tests
a48ce8f4bf Help: Add documentation for default generator environment variables
083cf7e8a2 cmake: Allow default generator to be set by environment variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3218
 2019-05-22 10:32:43 -04:00
Brad King
fc4cbbc2a5 Merge topic 'remove_unneeded_device_link_calls' 
81b4d10d8f CUDA: More exhaustive checks to determine when to do device linking
3205c7c950 cmNinjaLinkLineDeviceComputer now lives in the correct source file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3320
 2019-05-22 10:30:00 -04:00
Brad King
c024e44abe Merge topic 'find-package-prefer-config' 
26a99da206 find_package: Add option to prefer Config mode
c365243a3a find_package: Factor out module and config find_package methods

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
Merge-request: !3339
 2019-05-22 10:28:59 -04:00
Brad King
aefd424b6b Merge topic 'swift-debug-variant' 
62381effba Ninja,Swift: reuse `SWIFT_MODULE_NAME` for `SWIFT_MODULE`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3343
 2019-05-22 10:28:00 -04:00
Brad King
f83f29dbaa Merge topic 'vs-ApplicationTypeRevision' 
9c07cefee5 VS: Fix ApplicationTypeRevision in builtin check projects
639e14def6 VS: Factor out helper to compute ApplicationTypeRevision

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3350
 2019-05-22 10:27:01 -04:00
Brad King
9e07ea190b Merge topic 'compiler-id-arch-only-iar' 
4c0fb923b7 IAR: Do not print compiler architecture id for non-IAR compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3352
 2019-05-22 10:25:50 -04:00
Brad King
021c61408c Merge topic 'ninja-lib-symlink-space' 
13c92b4a30 Ninja: Fix creation of library symlinks in folders with spaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3341
 2019-05-22 10:24:46 -04:00
Brad King
5a1af142f1 Genex: Fix value lifetimes in nested TARGET_PROPERTY evaluation 
For special properties like `INCLUDE_DIRECTORIES`, the pointer returned
by `cmTarget::GetProperty` is only valid until the next time the same
special property is queried on *any* target.  When evaluating a nested
`TARGET_PROPERTY` generator expression we may look up such a property
more than once on different targets.  Fix `TargetPropertyNode::Evaluate`
to store the lookup result in locally owned memory earlier.

Fixes: #19286
 2019-05-22 10:19:41 -04:00
Brad King
01b6a2c4ee Merge branch 'release-3.14' 2019-05-22 09:45:49 -04:00
Brad King
974f4abbf8 Merge topic 'libarchive-solaris-11.4' 
6c81c6538b libarchive: avoid b64_encode name conflict with Solaris built-in function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3351
 2019-05-22 09:44:28 -04:00
Craig Scott
ad32282a3e Merge topic 'file-remove-no-empty' 
a1eb03569d file: Change REMOVE to ignore empty names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3349
 2019-05-22 08:57:29 -04:00
Eicke Herbertz
d0f0ba0f7a Tests: Add environment generator tests 2019-05-22 07:40:51 -04:00
Eicke Herbertz
a48ce8f4bf Help: Add documentation for default generator environment variables 
Documentation for environment variables that control the default
generator selection:

* CMAKE_GENERATOR
* CMAKE_GENERATOR_INSTANCE
* CMAKE_GENERATOR_PLATFORM
* CMAKE_GENERATOR_TOOLSET
 2019-05-22 07:40:49 -04:00
Sebastian Holtermann
71d6a1455e Autogen: Evaluate compiler features for the same exectuable only once 
To speed up the `AUTOGEN` configuration process, evaluate the compiler
features only once.  The feature evaluation result is stored in the new class
`cmQtAutoGen::CompilerFeatures`, and the instance is shared by using
`std::shared_ptr`.
 2019-05-22 12:25:17 +02:00
Sebastian Holtermann
5b53cfda24 cmSystemTools: Remove cmSystemToolsFileTime interface 
This removes the C style cmSystemToolsFileTime interface in cmSystemTools.
It was replaced by the RAII based cmFileTimes class.
 2019-05-22 10:57:10 +02:00
Sebastian Holtermann
9c576a88d9 Use cmFileTimes instead of cmSystemToolsFileTime interface 2019-05-22 10:57:10 +02:00
Sebastian Holtermann
4b45a5d5c7 cmFileTimes: New RAII based cmFileTimes class 
This adds a new RAII based cmFileTimes class.
It is supposed to replace the C style cmSystemToolsFileTime interface.
 2019-05-22 10:57:10 +02:00
Kitware Robot
f01e18eb46 CMake Nightly Date Stamp 2019-05-22 00:01:06 -04:00