mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
44,513 Commits 2 Branches 393 Tags
dd53122be5b142e97ac02d1dec62719db29bc39e
Commit Graph

44513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Cristian Adam
8ed868606d find_package: Fix prefer-config mode to not fail on missing optional package 
When `CMAKE_FIND_PACKAGE_PREFER_CONFIG` mode was set to `ON`, failure to
find a package was fatal even if it was not `REQUIRED`.  Fix this and
add a test case.

Fixes: #19557
 2019-08-06 09:36:36 -04:00
Kitware Robot
53fc083d37 CMake Nightly Date Stamp 2019-08-06 00:01:07 -04:00
Marc Chevrier
7ed84b1e8f FindPython: ensure virtual environments are correctly handled 
Fixes: #19525
 2019-08-05 18:20:29 +02:00
Alex Turbov
493b8eae36 Help: Fix example output in the CMAKE_MESSAGE_INDENT documentation 2019-08-05 18:17:46 +03:00
Brad King
2327cc0e05 Merge topic 'control-block3' 
41364824ad cmFunctionBlocker: Recycle functions
6491270e0d cmFunctionBlocker: Move check for matching args
af24e4ef6e cmFunctionBlocker: Move common logic to base
ef38ff22f7 cm*FunctionBlocker: Extract function Replay
b51fba6298 cmMakefile: Add OnExecuteCommand callback
c76500949d cm*FunctionBlocker: Move to source file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3632
 2019-08-05 10:42:50 -04:00
Brad King
c969d4628b Merge topic 'cleanup_cmake_constructor' 
0962589627 cmake: Initialize booleans at declaration and cleanup constructor

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3646
 2019-08-05 10:40:46 -04:00
Brad King
e0f735f8f5 Merge topic 'shared-deps-no-iface' 
d75cad01f0 Fix rpath-link for shared lib with only private deps
4b2e1fc9ee cmGeneratorTarget: Use local var to de-duplicate CMP0022 checks
94648953be cmLinkItem: Simplify tracking of whether link interface is explicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3642
 2019-08-05 10:37:47 -04:00
Brad King
26a3bccb60 Merge topic 'link-library-file-flag' 
f6d6dbc293 Make CMAKE_LINK_LIBRARY_FILE_FLAG work like CMAKE_LINK_LIBRARY_FLAG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3641
 2019-08-05 10:31:18 -04:00
Brad King
1c3404a301 Merge branch 'clang-frontend-variant' into release-3.15 
Merge-request: !3650
 2019-08-05 10:28:29 -04:00
Brad King
e9ade44cb1 Merge branch 'release-3.15' 2019-08-05 10:27:47 -04:00
Brad King
7eb2fd6ca6 Merge topic 'fileapi-install-generators' 
d70a0f8681 fileapi: Fix codemodel target install destination for cross-dir rules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3639
 2019-08-05 10:20:27 -04:00
Hong Xu
d192caefff CMakeDependentOption: Document that 4th parameter follows if-syntax 2019-08-05 10:15:21 -04:00
Brad King
a245479372 clang: Work around toolchain file use of internal CMake variables 
Since commit d44c0db0b2 (clang: setup correct configuration in gnu mode,
2019-02-20, v3.15.0-rc1~41^2~5) our Clang compiler information modules
need the `CMAKE_<LANG>_COMPILER_FRONTEND_VARIANT` variable that we
compute during compiler detection.  However, some existing toolchain
files set our internal `CMAKE_<LANG>_COMPILER_ID_RUN` variables and
block that detection, but do not set the new frontend variant variable.
Help them out by setting `CMAKE_<LANG>_COMPILER_FRONTEND_VARIANT` anyway.

Fixes: #19515, #19539
 2019-08-05 09:43:00 -04:00
Sebastian Holtermann
959b97a27f Tests: testStringAlgorithms: Add cmTrimWhitespace, cmEscapeQuotes, cmTokenize 
Extend the testStringAlgorithms test with tests for `cmTrimWhitespace`,
`cmEscapeQuotes` and `cmTokenize`.
 2019-08-05 11:25:30 +02:00
Sebastian Holtermann
7fbcc16dcd cmStringAlgorithms: cmIsSpace, cmTrimWhitespace, cmEscapeQuotes, cmTokenize 
This adds the following functions to `cmStringAlgorithms`:

- `cmIsSpace`
- `cmTrimWhitespace` (moved from `cmSystemTools::TrimWhitespace`)
- `cmEscapeQuotes` (moved from `cmSystemTools::EscapeQuotes`)
- `cmTokenize` (moved from `cmSystemTools::tokenize` and adapted to
  accept `cm::string_view`)
 2019-08-05 11:25:30 +02:00
Kitware Robot
3ebd3fa51d CMake Nightly Date Stamp 2019-08-05 00:01:06 -04:00
Kitware Robot
18a0d47bec CMake Nightly Date Stamp 2019-08-04 00:01:07 -04:00
Sebastian Holtermann
0962589627 cmake: Initialize booleans at declaration and cleanup constructor 2019-08-03 11:44:38 +02:00
Kitware Robot
2a5d077a89 CMake Nightly Date Stamp 2019-08-03 00:01:09 -04:00
Brad King
d75cad01f0 Fix rpath-link for shared lib with only private deps 
Under CMP0022 NEW behavior, the link interface is explicit even if there
are no public dependencies (`INTERFACE_LINK_LIBRARIES` is not set).
Mark it as such to activate our tracking of private runtime dependencies
of shared libraries for generation of `-rpath-link` flags.

Fixes: #19556
 2019-08-02 14:50:57 -04:00
Brad King
4b2e1fc9ee cmGeneratorTarget: Use local var to de-duplicate CMP0022 checks 2019-08-02 14:48:34 -04:00
Brad King
94648953be cmLinkItem: Simplify tracking of whether link interface is explicit 
We now only need a boolean.
 2019-08-02 14:43:16 -04:00
Brad King
f6d6dbc293 Make CMAKE_LINK_LIBRARY_FILE_FLAG work like CMAKE_LINK_LIBRARY_FLAG 
The `CMAKE_LINK_LIBRARY_FILE_FLAG` variable is meant for linkers that
want library file paths to be preceded by a flag.  This is used only
for OpenWatcom to add the `library` argument before library file paths.
Refactor the approach to treat `CMAKE_LINK_LIBRARY_FILE_FLAG` as a
command-line string fragment to add just before the library file path.
This has two advantages:

* `CMAKE_LINK_LIBRARY_FILE_FLAG` now works like `CMAKE_LINK_LIBRARY_FLAG`.
* `CMAKE_LINK_LIBRARY_FILE_FLAG` can now be an attached flag whose value
  is the library file path.

Technically this is a change in behavior, but this setting was created
for internal use and should be rarely used outside of CMake itself.

Fixes: #19541
 2019-08-02 13:37:39 -04:00
Brad King
edca8d5c3a Merge branch 'fileapi-install-generators' into release-3.15 
Merge-request: !3639
 2019-08-02 11:06:22 -04:00
Brad King
7bacf0233b Merge topic 'use_cmHasPrefix' 
a693e875db Cleanups: Use cmHas{Prefix,Suffix} instead of String{Starts,Ends}With

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3637
 2019-08-02 10:56:59 -04:00
Brad King
94f7d19a98 Merge topic 'cmStringAlgorithms_modernize' 
4aa555f9da Tests: Add CMakeLib.testStringAlgorithms test
75cf7ec263 cmStringAlgorithms: Modernize cmWrap using cm::string_view
e5d3ea22d4 cmStringAlgorithms: Add cmCatViews and cmStrCat functions
a7d0fe9c24 cmStringAlgorithms: Simplify cmJoin using cm::string_view
541361a58b cmStringAlgorithms: Simplify cmStrCmp using cm::string_view

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3628
 2019-08-02 10:55:39 -04:00
Brad King
97d9876c78 Merge branch 'release-3.15' 2019-08-02 10:38:26 -04:00
Brad King
fa722a8792 Merge topic 'clang-cl-non-windows' 
863f7eb6d7 clang: Restore support for clang-cl on non-Windows hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3634
 2019-08-02 10:37:57 -04:00
Kitware Robot
a1e32626f7 CMake Nightly Date Stamp 2019-08-02 00:01:05 -04:00
Sebastian Holtermann
a693e875db Cleanups: Use cmHas{Prefix,Suffix} instead of String{Starts,Ends}With 2019-08-01 13:33:00 +02:00
Sebastian Holtermann
4aa555f9da Tests: Add CMakeLib.testStringAlgorithms test 2019-08-01 11:45:04 +02:00
Sebastian Holtermann
75cf7ec263 cmStringAlgorithms: Modernize cmWrap using cm::string_view 2019-08-01 11:45:04 +02:00
Sebastian Holtermann
e5d3ea22d4 cmStringAlgorithms: Add cmCatViews and cmStrCat functions 2019-08-01 11:45:04 +02:00