Commit Graph

27041 Commits

Author SHA1 Message Date
Kyle Edwards f799ff43d5 Merge topic 'function-blocker-stack'
020478dbea cmMakefile: Keep function blockers in a stack

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3613
2019-07-30 10:03:34 -04:00
Craig Scott ffe555ad88 Merge topic 'cmake-version'
fe2c558ba6 CMakeVersion: Preserve Git information during 'git archive'
0505a66cbf CMakeVersion: Add generic '-git' suffix when no git info is available
f7bf08754b CMakeVersion: Provide Git information in non-exact release versions
ac48259333 CMakeVersion: Re-order logic to obviate addition of each component
311f232f7a CMakeVersion: De-duplicate variable initialization
2f608566b4 CMakeVersion: Factor git execution into helper macro
74ff80323c CMakeVersion: Use FindGit module to find Git
e1e7986c00 CMakeVersion: Consider Git even with just a `.git` file
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3622
2019-07-30 09:41:57 -04:00
Kitware Robot 473f288e97 CMake Nightly Date Stamp 2019-07-30 00:01:11 -04:00
Brad King f6df9c2565 Merge topic 'modernize_string_view_cmOutputConverter'
ec892a572b cmOutputConverter: Make shell escaping methods cm::string_view based
8573e20c43 cmOutputConverter: Let GetFortranFormat accept a cm::string_view
4911762358 cmOutputConverter: Return bool instead of int in utility functions
a929255dec cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_view
1b30b28c04 cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_view
6675f785be cmOutputConverter: Let EscapeForCMake accept a cm::string_view
09977c1816 cmSystemTool: Let TrimWhitespace accept a cm::string_view
2f19e53705 cmSystemTool: Let HelpFileName accept a cm::string_view
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3615
2019-07-29 11:56:29 -04:00
Brad King fe2c558ba6 CMakeVersion: Preserve Git information during 'git archive'
Use `export-subst` to get information about the Git commit used to
produce an archive.
2019-07-29 11:37:32 -04:00
Brad King 0505a66cbf CMakeVersion: Add generic '-git' suffix when no git info is available 2019-07-29 11:25:44 -04:00
Brad King f7bf08754b CMakeVersion: Provide Git information in non-exact release versions
Our exact release commits have a subject of the form `CMake <version>`.
Distinguish development on a release branch in commits after such a
version but before the next release by providing Git information.
2019-07-29 11:25:44 -04:00
Brad King ac48259333 CMakeVersion: Re-order logic to obviate addition of each component 2019-07-29 11:25:44 -04:00
Brad King 311f232f7a CMakeVersion: De-duplicate variable initialization 2019-07-29 11:25:44 -04:00
Brad King 2f608566b4 CMakeVersion: Factor git execution into helper macro 2019-07-29 11:25:44 -04:00
Brad King 74ff80323c CMakeVersion: Use FindGit module to find Git
We now require at least CMake 3.1 to build, and that has the FindGit
module.
2019-07-29 11:25:44 -04:00
Brad King e1e7986c00 CMakeVersion: Consider Git even with just a .git file 2019-07-29 11:25:43 -04:00
Brad King 564bcb4cb3 CMakeVersion: Move git logic to main script 2019-07-29 11:25:43 -04:00
Brad King ecdf38aa36 CMakeVersion: Move computation logic to main script 2019-07-29 11:25:43 -04:00
Brad King 8cf4aec5ac CMakeVersion.rc: Compute resource components only on Windows 2019-07-29 11:25:43 -04:00
Kitware Robot 1df0cb577d CMake Nightly Date Stamp 2019-07-29 00:01:05 -04:00
Sebastian Holtermann ec892a572b cmOutputConverter: Make shell escaping methods cm::string_view based 2019-07-28 17:48:59 +02:00
Sebastian Holtermann 8573e20c43 cmOutputConverter: Let GetFortranFormat accept a cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann 4911762358 cmOutputConverter: Return bool instead of int in utility functions 2019-07-28 17:47:26 +02:00
Sebastian Holtermann a929255dec cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann 1b30b28c04 cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann 6675f785be cmOutputConverter: Let EscapeForCMake accept a cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann 09977c1816 cmSystemTool: Let TrimWhitespace accept a cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann 2f19e53705 cmSystemTool: Let HelpFileName accept a cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann 2c5454f227 cmSystemTool: Let EscapeQuotes accept a cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann ad3183db8c cmSystemTool: Let Expand(ed)ListArgument accept a cm::string_view 2019-07-28 17:47:26 +02:00
Kitware Robot 200eadcd90 CMake Nightly Date Stamp 2019-07-28 00:01:06 -04:00
Kitware Robot 38894b43ef CMake Nightly Date Stamp 2019-07-27 00:01:13 -04:00
Regina Pfeifer 020478dbea cmMakefile: Keep function blockers in a stack
Highlight the fact that we only ever operate on the top element.
2019-07-27 00:22:15 +02:00
Brad King 8ce189720e Merge topic 'cmake-version-rc'
eb5ea5a505 CMakeVersion: Use '-rc0' version suffix on release branches prior to rc1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3609
2019-07-26 12:19:25 -04:00
Kyle Edwards 8fd481a899 Merge topic 'ep_support_no_submodule_init'
d6be117ca0 ExternalProject: Support not initializing any submodules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3579
2019-07-26 12:02:34 -04:00
Kyle Edwards 618bd463ad Merge topic 'remove_compiler_rpath'
bd2793b6e9 Help: Add documentation for INSTALL_REMOVE_ENVIROMENT_RPATH
f08dcbffec Property: Add INSTALL_REMOVE_ENVIROMENT_RPATH property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3544
2019-07-26 12:01:27 -04:00
Brad King eb5ea5a505 CMakeVersion: Use '-rc0' version suffix on release branches prior to rc1
Revert the change from commit 7b354baad5 (CMakeVersion: Set
CMake_VERSION_RC to 0 even in non-rc versions, 2019-07-25) and instead
define a `0` value in `CMake_VERSION_RC` to mean `-rc0`.  This
distinguishes release branch versions prior to the first release
candidate from the first release candidate itself.  It also makes room
for a dedicated "CMake $major.$minor.0-rc1" release commit for `-rc1` as
we have for later release candidates and final releases.
2019-07-26 08:08:30 -04:00
Brad King 52ea0c4676 Merge topic 'optimize-usage-requirements'
1d3841b600 Genex: Memoize usage requirement TARGET_PROPERTY existence
b5460f9931 cmLinkItem: Expose HadHeadSensitiveCondition in cmLinkInterfaceLibraries
ad2b3a32d1 Genex: Optimize build setting TARGET_PROPERTY evaluation
11fa818ecd Genex: Optimize usage requirement TARGET_PROPERTY recursion
0239bf8ac8 Genex: In TARGET_PROPERTY check for usage reqs in link libs earlier
7caebeb0e4 Genex: Re-order TARGET_PROPERTY logic to de-duplicate checks
b2785a0fbd Genex: Move TARGET_PROPERTY linked targets evaluation to end

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !3589
2019-07-26 07:33:27 -04:00
Brad King 467e6ac728 Merge topic 'definitions_string_view'
e91bfe440c cmMakefile: Let AddDefinition accept a value as cm::string_view
f2ba968ef2 cmMakefile: Simplify and rename AddDefinitionBool
9b5cc42531 cmDefinitions: Remove const char* based Set method
e268840c0a cmDefinitions: Add Unset and cm::string_view based Set methods
451fd329a8 cmDefinitions: Cleanups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3577
2019-07-26 07:32:18 -04:00
Brad King c23c4ed9cf Merge topic 'IsON_IsOFF_string_view'
4ff0bb054b cmSystemTools: Make IsInternallyOn, IsON and IsOff cm::string_view based
65d3ea2c7f cmAlgorithms: Make cmHasLiteral{Prefix,Suffix} cm::string_view based

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3598
2019-07-26 07:30:45 -04:00
Brad King 9f23c91919 Merge topic 'update-kwsys'
aff019f7a4 Merge branch 'upstream-KWSys' into update-kwsys
780d9e070b KWSys 2019-07-25 (a24a6acb)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3602
2019-07-26 07:29:21 -04:00
Brad King c9af23d2a1 Merge topic 'variable-typo'
94f536b935 cmCTestHandlerCommand: fix typo of local variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3600
2019-07-26 07:28:09 -04:00
Kitware Robot 7feece688d CMake Nightly Date Stamp 2019-07-26 00:01:24 -04:00
Jiang Yue f08dcbffec Property: Add INSTALL_REMOVE_ENVIROMENT_RPATH property 2019-07-25 12:30:23 -04:00
Brad King 7b354baad5 CMakeVersion: Set CMake_VERSION_RC to 0 even in non-rc versions
The logic that uses this value already ignores any "false" value, so `0`
is just as good as not being set at all.  Using `0` for this role makes
the version components look more symmetric and reduces the number of
edits needed when creating releases.
2019-07-25 09:23:48 -04:00
Brad King aff019f7a4 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2019-07-25 (a24a6acb)
2019-07-25 07:54:34 -04:00
Brad King 9111590aca Merge topic 'ninja-swift-map-file-path'
3391a3eca8 Ninja: do not normalise swift support file paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3597
2019-07-25 07:21:18 -04:00
Brad King c173ed1184 Merge topic 'makefile-depend-relative-include'
d46bac5d38 Makefile: Fix regression in dependencies on relative includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3599
2019-07-25 07:20:09 -04:00
Kitware Robot 00be1957da CMake Nightly Date Stamp 2019-07-25 00:01:08 -04:00
Ben Boeckel 94f536b935 cmCTestHandlerCommand: fix typo of local variable 2019-07-24 15:29:32 -04:00
Sebastian Holtermann 4ff0bb054b cmSystemTools: Make IsInternallyOn, IsON and IsOff cm::string_view based 2019-07-24 19:31:14 +02:00
Sebastian Holtermann 65d3ea2c7f cmAlgorithms: Make cmHasLiteral{Prefix,Suffix} cm::string_view based 2019-07-24 19:31:14 +02:00
Brad King 156f4c2f80 Merge topic 'find_pkg_use_new_global_controls'
609fe39043 FindPackage:  Support `NO_[]_PATH` global call options
ff29c92df6 Tests: find_file restore PATH env variable after test runs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3590
2019-07-24 11:55:03 -04:00
Brad King 47777942a5 Merge topic 'math_exp_not'
d427f12b73 math(EXPR): Implement ~(exp_NOT) expression as documented

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3582
2019-07-24 11:53:54 -04:00