Commit Graph

44553 Commits

Author SHA1 Message Date
Kyle Edwards 17b66165f6 Merge topic 'strcat-localgenerator'
62659100aa cmLocalGenerator: Use cmStrCat

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@web.de>
Merge-request: !3671
2019-08-13 09:53:47 -04:00
Kyle Edwards 9ab15fa74a Merge topic 'cmRemoveQuotes'
27090096ef cmStringAlgorithms: Add cmRemoveQuotes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3665
2019-08-13 09:52:23 -04:00
Kyle Edwards 9e9766d85c Merge topic 'cmake-bootstrap-def'
d4d5053c30 Refactor: Finish replacing CMAKE_BUILD_WITH_CMAKE with CMAKE_BOOTSTRAP
fe921edd49 Utilities/Scripts: Remove temporary CMAKE_BOOTSTRAP conversion script
54e9d38c28 Refactor: Convert all instances of CMAKE_BUILD_WITH_CMAKE to CMAKE_BOOTSTRAP
ad0e44a18b Utilities/Scripts: Add temporary CMAKE_BOOTSTRAP conversion script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3662
2019-08-13 09:50:42 -04:00
Kitware Robot 7d194f7d83 CMake Nightly Date Stamp 2019-08-13 00:01:05 -04:00
Kitware Robot 42c993742d CMake Nightly Date Stamp 2019-08-12 00:01:06 -04:00
Kitware Robot 70c56b856c CMake Nightly Date Stamp 2019-08-11 00:01:08 -04:00
Kitware Robot 32a7605e69 CMake Nightly Date Stamp 2019-08-10 00:01:11 -04:00
Kyle Edwards d4d5053c30 Refactor: Finish replacing CMAKE_BUILD_WITH_CMAKE with CMAKE_BOOTSTRAP
Remove -DCMAKE_BUILD_WITH_CMAKE from Source/CMakeLists.txt. Remove
CMAKE_BOOTSTRAP from bootstrap's cmConfigure.h. Add -DCMAKE_BOOTSTRAP
to all bootstrap sources, and remove the Unix specialization of
CMAKE_BOOTSTRAP in libuv (a review of the libuv code suggests that
this will not have an effect on the Windows build.)
2019-08-09 10:42:02 -04:00
Kyle Edwards fe921edd49 Utilities/Scripts: Remove temporary CMAKE_BOOTSTRAP conversion script 2019-08-09 10:42:02 -04:00
Kitware Robot 54e9d38c28 Refactor: Convert all instances of CMAKE_BUILD_WITH_CMAKE to CMAKE_BOOTSTRAP 2019-08-09 10:41:44 -04:00
Kyle Edwards ad0e44a18b Utilities/Scripts: Add temporary CMAKE_BOOTSTRAP conversion script 2019-08-09 10:40:36 -04:00
Brad King 1996e01578 Merge topic 'cmFileCommand-refactoring'
a7a5f376bc cmFileCommand: Use cmSubcommandTable
b66b7464ab Introduce cmSubcommandTable
2b785875fb cmFileCommand: turn into free function
9703c65718 cmFileCommand: put subcommands in unnamed namespace
64f987c174 cmFileCommand: port to cmExecutionStatus

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3657
2019-08-09 10:39:36 -04:00
Brad King 1263b0884b Merge topic 'cmDefinitions_cleanups'
1a47d368d8 cmDefinitions: Cleanups and optimizations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3666
2019-08-09 10:37:25 -04:00
Brad King 7891f69c67 Merge topic 'autogen_cmStrCat'
ca2923110c Autogen: Modernize to use cmStrCat for string concatenation
d02a99d9d3 Autogen: Modernize code to use cm::string_view for the info writer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3663
2019-08-09 10:33:00 -04:00
Brad King 6f3c429ee8 Merge topic 'soname-darwin'
2171f6ec0e Swift: correct SONAME flag for Darwin targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3640
2019-08-09 10:30:45 -04:00
Brad King 1a901ed09e Merge topic 'fphsa-components-space'
e45187d525 FPHSA: Remove extra space in module components report

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !3655
2019-08-09 10:28:45 -04:00
Brad King 8bd5e5f181 Merge topic 'execution-status'
5558070d52 cmExecutionStatus: Remove function Clear

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3654
2019-08-09 10:26:33 -04:00
Sebastian Holtermann 27090096ef cmStringAlgorithms: Add cmRemoveQuotes
- Add `cmRemoveQuotes` function to cmStringAlgorithms
- Remove unused removeQuotes inline functions
2019-08-09 12:20:50 +02:00
Regina Pfeifer 62659100aa cmLocalGenerator: Use cmStrCat
Grep for '[A-Z]_";' to find places that could benefit from cmStrCat.
2019-08-09 10:58:00 +02:00
Kitware Robot 242435a9c8 CMake Nightly Date Stamp 2019-08-09 00:01:06 -04:00
Sebastian Holtermann 1a47d368d8 cmDefinitions: Cleanups and optimizations
In cmDefinitions:
- sort methods in source code by static or not static
- use `std::unordered_set<cm::string_view>` instead of `std::set<std::string>`
  for duplications tests.
2019-08-08 14:12:43 +02:00
Kitware Robot 38a5b0203f CMake Nightly Date Stamp 2019-08-08 00:01:08 -04:00
Sebastian Holtermann ca2923110c Autogen: Modernize to use cmStrCat for string concatenation 2019-08-07 19:48:02 +02:00
Brad King 114c52fa5b Merge branch 'release-3.15' 2019-08-07 13:35:14 -04:00
Brad King 40bbe50e23 CMake 3.15.2 v3.15.2 2019-08-07 12:44:19 -04:00
Brad King d3d7e2c6d0 Merge branch 'release-3.15' 2019-08-07 12:43:57 -04:00
Brad King 4d7fc09902 Merge topic 'doc-relnotes-3.15'
18ce372e0f Help: Add 3.15.2 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3664
2019-08-07 12:43:39 -04:00
Brad King dfac85bb11 Merge branch 'doc-relnotes-3.15' into release-3.15
Merge-request: !3664
2019-08-07 12:42:56 -04:00
Brad King 18ce372e0f Help: Add 3.15.2 release notes 2019-08-07 12:41:27 -04:00
Sebastian Holtermann d02a99d9d3 Autogen: Modernize code to use cm::string_view for the info writer 2019-08-07 18:01:32 +02:00
Brad King bbf4a5771f Merge topic 'tidy_inefficient_string'
18b0330b86 clang-tidy: Enable performance-inefficient-string-concatenation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3648
2019-08-07 11:54:53 -04:00
Brad King dd53122be5 Merge topic 'FindPython-virtual-env'
7ed84b1e8f FindPython: ensure virtual environments are correctly handled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3649
2019-08-07 11:52:57 -04:00
Brad King ddb1759b3e Merge topic 'cmStringAlgorithms_move_functions'
959b97a27f Tests: testStringAlgorithms: Add cmTrimWhitespace, cmEscapeQuotes, cmTokenize
7fbcc16dcd cmStringAlgorithms: cmIsSpace, cmTrimWhitespace, cmEscapeQuotes, cmTokenize

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3647
2019-08-07 11:47:54 -04:00
Brad King 97b12c7922 Merge topic 'doc-CMAKE_MESSAGE_INDENT-spelling-typo'
8fe129e314 Help: Fix spelling typo in `CMAKE_MESSAGE_INDENT` docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3658
2019-08-07 11:44:57 -04:00
Brad King 2ad281996e Merge branch 'release-3.15' 2019-08-07 09:59:43 -04:00
Brad King 26f0f8bfca Merge topic 'FindGLEW-macOS'
feeb0381bc FindGLEW: Fix typo in verbose log message
ab822a9b48 FindGLEW: Add required OpenGL dependency in macOS
a8a3efa3be FindGLEW: Fix macOS library suffix selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3656
2019-08-07 09:58:56 -04:00
Brad King ce14f6c677 Merge topic 'find_package-prefer-config-not-found'
8ed868606d find_package: Fix prefer-config mode to not fail on missing optional package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3653
2019-08-07 09:57:35 -04:00
Kitware Robot e295290ed7 CMake Nightly Date Stamp 2019-08-07 00:01:08 -04:00
Alex Turbov 8fe129e314 Help: Fix spelling typo in CMAKE_MESSAGE_INDENT docs 2019-08-06 18:35:10 +03:00
Regina Pfeifer a7a5f376bc cmFileCommand: Use cmSubcommandTable 2019-08-06 17:21:52 +02:00
Regina Pfeifer b66b7464ab Introduce cmSubcommandTable 2019-08-06 17:21:52 +02:00
Brad King 52d9cd624f Merge topic 'doc-fix-CMAKE_MESSAGE_INDENT-sample-output'
493b8eae36 Help: Fix example output in the `CMAKE_MESSAGE_INDENT` documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3651
2019-08-06 09:58:25 -04:00
Brad King a09d14bbce Merge topic 'cmake-dependent-option-doc'
d192caefff CMakeDependentOption: Document that 4th parameter follows if-syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3643
2019-08-06 09:57:19 -04:00
Brad King 1c7a4f93dd Merge branch 'FindGLEW-macOS' into release-3.15
Merge-request: !3656
2019-08-06 09:53:42 -04:00
Claudio Fantacci feeb0381bc FindGLEW: Fix typo in verbose log message 2019-08-06 09:49:03 -04:00
Claudio Fantacci ab822a9b48 FindGLEW: Add required OpenGL dependency in macOS
macOS requires OpenGL as INTERFACE_LINK_LIBRARIES dependency
in the GLEW targets. This commit fixes this issue.
2019-08-06 09:49:03 -04:00
Claudio Fantacci a8a3efa3be FindGLEW: Fix macOS library suffix selection
Fix logic added by commit a7d853868b (FindGLEW: Update implementation,
2019-03-13, v3.15.0-rc1~375^2~1) on macOS.  macOS is recognized as both
UNIX and APPLE.  Consequently, the library suffix for shared and static
library was set, respectively, as `.so` and `.a`, just like UNIX systems.
Fix this by properly checking the OS type.

Fixes: #19542
2019-08-06 09:47:35 -04:00
Brad King 9a384e7304 Merge branch 'find_package-prefer-config-not-found' into release-3.15
Merge-request: !3653
2019-08-06 09:43:25 -04:00
Brad King fdaad9a067 Merge branch 'release-3.15' 2019-08-06 09:42:26 -04:00
Brad King 6f359e120f Merge topic 'clang-frontend-variant'
a245479372 clang: Work around toolchain file use of internal CMake variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3650
2019-08-06 09:41:38 -04:00