Commit Graph

43853 Commits

Author SHA1 Message Date
Frank Dana
42a9e61056 message() help: Clarify how logs are displayed in various tools 2019-07-10 09:40:11 +10:00
Brad King
1b52415cd4 Merge branch 'ccmake-clear-aliases' into release-3.15
Merge-request: !3529
2019-07-09 09:35:01 -04:00
Brad King
dd1257e2de Merge branch 'iar-riscv' into release-3.15
Merge-request: !3510
2019-07-09 09:34:42 -04:00
Craig Scott
d7673a203c Merge branch 'loglevel-option-case-consistency' into release-3.15
Merge-request: !3521
2019-07-09 22:42:51 +10:00
Brad King
b66d61a8d0 cmGlobalGenerator: Do not persist alias targets across configures
In `ccmake` a single global generator instance may be used for multiple
configure step runs.  The `cmGlobalGenerator::ClearGeneratorMembers`
method is supposed to clear global state that is specific to each
configure run but forgot to clear alias targets.

Fixes: #19457
2019-07-08 14:40:46 -04:00
Stefan Andersson
c242187875 IAR: Add support for the RISC-V compiler 2019-07-08 13:11:45 -04:00
Craig Scott
14ed40d670 Help: Use consistent levels for cmake --loglevel and message()
The message() command requires uppercase log levels. Even
though the cmake --loglevel option is not case sensitive, show
the supported values as uppercase to match the message()
docs as closely as possible, since they are related to the same
feature.

Also fixes the wrong string being shown for the warning level
by cmake --help.
2019-07-08 20:11:33 +10:00
Craig Scott
12e46dc413 Merge branch 'docs-misc-trivial-cleanups' into release-3.15
Merge-request: !3498
2019-07-04 22:29:39 +10:00
Craig Scott
d5b722bbbd Help: Remove mention of CMAKE_INSTALL_DO_STRIP
It isn't yet clear whether we want to make this part of the
documented API for the install script. Remove it from the
docs before it appears in an official release for now.

Relates: #18997
2019-07-03 23:38:25 +10:00
Craig Scott
ddc7ea4696 Help: Clarify how to provide multiple targets with cmake --target 2019-07-03 23:38:25 +10:00
Craig Scott
c509f38b7b Help: Add missing xref for CMAKE_EXECUTE_PROCESS_COMMAND_ECHO 2019-07-03 23:38:25 +10:00
Craig Scott
9cc6befe1b Help: Improve formatting of list(TRANSFORM) sub-options 2019-07-03 23:38:25 +10:00
Craig Scott
074fbdb73f Help: Clean up trivial typos and grammar 2019-07-03 23:38:25 +10:00
Brad King
1f389b4498 Merge branch 'FindPostgreSQL-lib-dir' into release-3.15
Merge-request: !3505
2019-07-03 07:30:43 -04:00
Craig Scott
581e011cef Merge topic 'doc-toolchain-file-CMAKE_SOURCE_DIR' into release-3.15
Merge-request: !3495
2019-07-03 19:08:45 +10:00
Oleg Chernovskiy
16434fe303 Help: Discourage using CMAKE_SOURCE_DIR in toolchain files
Fixes: #19390
2019-07-03 08:45:29 +10:00
Brad King
d21b890a4c FindPostgreSQL: Fix regression in computation of library directory
Since commit 368bcba28a (FindPostgreSQL: Find debug lib, imported
configs, 2019-05-09, v3.15.0-rc1~93^2) the `PostgreSQL_LIBRARY` variable
may contain a list and therefore should not be passed to the
`get_filename_component` command directly.  Instead spell out the logic
to compute `PostgreSQL_LIBRARY_DIR` from one of the per-configuration
variables.

Fixes: #19444
2019-07-02 07:32:14 -04:00
Brad King
c56201bdac Merge branch 'qt-5.13' into release-3.15
Merge-request: !3500
2019-07-01 10:23:48 -04:00
Brad King
9d0ad814f6 Merge branch 'update-expat' into release-3.15
Merge-request: !3501
2019-07-01 09:44:52 -04:00
Brad King
0998f6396a Merge branch 'upstream-expat' into update-expat
* upstream-expat:
  expat 2019-06-19 (d3b78b42)
2019-07-01 09:42:12 -04:00
Expat Upstream
ba13dc2aa8 expat 2019-06-19 (d3b78b42)
Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit d3b78b42a2dcdea98e22625cfff67a49d47e6025 (R_2_2_7).
2019-07-01 09:42:12 -04:00
Brad King
7449c63f3e expat: Update script to get Expat 2.2.7 2019-07-01 09:41:47 -04:00
Sebastian Holtermann
963ddafeaa QtDialog: Use QPalette::WindowText instead of QPalette::Foreground
`QPalette::Foreground` is deprecated and was replaced by
`QPalette::WindowText` since at least Qt 4.8.

https://doc.qt.io/archives/qt-4.8/qpalette.html#ColorRole-enum

This replaces the `QPalette::Foreground` color role with `QPalette::WindowText`
in `QtDialog/RegexExplorer.cxx` to avoid compiler warnings.
2019-07-01 09:18:24 -04:00
Sebastian Holtermann
1a2d6bdefc Tests: Autogen: Use valid rcc compression levels
Avoid the invalid compression level 0 when invoking rcc.
It let's rcc fail with an error since Qt 5.13.
2019-07-01 09:18:24 -04:00
Brad King
7a3d9b08b9 Merge branch 'cuda-no-device-link-when-disabled' into release-3.15
Merge-request: !3491
2019-07-01 08:36:28 -04:00
Robert Maynard
a4d502a5bf CUDA: Do not device link if CUDA is not an enabled language
Checks added in commit 81b4d10d8f (CUDA: More exhaustive checks to
determine when to do device linking, 2019-05-09, v3.15.0-rc1~82^2)
assumed that CUDA properties would be set only if CUDA is enabled.

We cannot do a device link step if we do not have the CUDA language
enabled.  This was discovered as some projects unconditionally set CUDA
properties such as `CUDA_RESOLVE_DEVICE_SYMBOLS` even when the CUDA
language has not been enabled.

Fixes: #19432
2019-07-01 08:29:10 -04:00
Craig Scott
3936e78bfe Merge branch 'docs-project-code-injection' into release-3.15
Merge-request: !3494
2019-07-01 21:55:06 +10:00
Craig Scott
32dae26975 Merge branch 'bug/19436' into release-3.15
Merge-request: !3497
2019-07-01 21:49:18 +10:00
Craig Scott
42294f43bd Help: move code injection vars to their own section
The docs for CMAKE_PROJECT_<projName>_INCLUDE and
CMAKE_PROJECT_INCLUDE did not define the order of
inclusion if both were set.
2019-07-01 08:01:49 +10:00
Alex Turbov
822abf1265 list(POP_FRONT): Fix always assigning first item to output vars
Fixes: #19436
2019-06-30 13:15:29 +03:00
Craig Scott
9e0775cb6a Help: Remove self-references from project() docs 2019-06-29 22:21:18 +10:00
Brad King
753373579e CMake 3.15.0-rc3 v3.15.0-rc3 2019-06-27 07:35:14 -04:00
Brad King
d9a9150351 Merge branch 'cuda-msvc-runtime-library' into release-3.15
Merge-request: !3485
2019-06-26 08:43:19 -04:00
Brad King
8fbd25772f CUDA: Implement MSVC runtime library abstraction
In commit fb3370b6a1 (MSVC: Add abstraction for runtime library
selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked updating flags
for CUDA on Windows, where nvcc uses MSVC as the host compiler.  Add
them now and update the MSVCRuntimeLibrary test to cover CUDA.

Fixes: #19428
2019-06-26 08:36:48 -04:00
Brad King
07807a2006 VS: Use AddLanguageFlags to de-duplicate CMAKE_{CUDA,ASM*}_FLAGS lookup
Apply the refactoring from commit 707283981f (VS: Use AddLanguageFlags
to de-duplicate CMAKE_<LANG>_FLAGS* lookup, 2019-04-01,
v3.15.0-rc1~300^2) to the CUDA, ASM_MASM, and ASM_NASM languages too.
In particular, CUDA needs the MSVC runtime library selection logic
in the `AddLanguageFlags` method that is used by other generators.
2019-06-26 08:36:48 -04:00
Brad King
2bbbc4ce1f Merge branch 'doc-CMAKE_FRAMEWORK-crossref' into release-3.15
Merge-request: !3478
2019-06-26 06:56:37 -04:00
Brad King
edec1c2615 Merge branch 'export-targets-empty' into release-3.15
Merge-request: !3484
2019-06-26 06:53:40 -04:00
Brad King
2ba5c37b3f export: Restore support for empty TARGETS list
Refactoring in commit f5acecaa6f (cmExportCommand: Port to
cmArgumentParser, 2019-03-23, v3.15.0-rc1~270^2~3) broke the `export`
command's support for specifying `TARGETS` with no entries.  Fix it and
add a test case.

Fixes: #19415
2019-06-25 17:23:34 -04:00
Brad King
7113b94346 Merge branch 'ninja-nvcc-rsp' into release-3.15
Merge-request: !3482
2019-06-25 14:35:27 -04:00
Francisco Facioni
eda4c43879 Ninja: Fix CUDA device linking when using response files
Fix the logic added by commit d91b5a72cd (Ninja: Add support for CUDA
nvcc response files, 2019-05-30, v3.15.0-rc1~8^2) to always use the CUDA
compiler response file flag for response files during device linking.
2019-06-25 14:30:36 -04:00
Brad King
9334a4b472 Merge branch 'iconv-c++11' into release-3.15
Merge-request: !3469
2019-06-25 09:27:56 -04:00
Rolf Eike Beer
736f38ff34 FindIconv test: request C++11 2019-06-25 15:14:02 +02:00
Craig Scott
f57a53d43e Help: Document that CMAKE_FRAMEWORK initializes FRAMEWORK target prop 2019-06-25 21:57:31 +10:00
Brad King
154d25f5ba Merge branch 'doc-typos-cmake_parse_arguments' into release-3.15
Merge-request: !3468
2019-06-24 09:44:07 -04:00
Craig Scott
264612c013 Help: Typo and grammar fixes in cmake_parse_arguments() docs 2019-06-23 21:10:16 +10:00
Brad King
7dbd21fcf4 Merge branch 'doc-IMPORTED_LOCATION' into release-3.15
Merge-request: !3466
2019-06-21 12:00:44 -04:00
Alexandru Croitor
96c6bc2584 Help: Improve documentation of IMPORTED_LOCATION property
Mention the usage of a configuration specific
`IMPORTED_LOCATION_<CONFIG>` value even if the `<CONFIG>` is not the
same as the active configuration of the currently built project.

Co-Author: Brad King <brad.king@kitware.com>
2019-06-21 11:59:38 -04:00
Brad King
036752cc0e Merge branch 'autogen_documentation' into release-3.15
Merge-request: !3461
2019-06-19 10:43:43 -04:00
Sebastian Holtermann
b55e5d6641 Help: Autogen: Overhaul AUTOMOC target property documentation
- Rewrites and restructures the AUTOMOC target property documentation
- Remove the reference to the deprecated CMAKE_AUTOMOC_RELAXED_MODE

Fixes: #19167
2019-06-19 10:40:42 -04:00
Sebastian Holtermann
fdab21f30b Help: Autogen: Overhaul AUTOUIC target property documentation 2019-06-19 10:40:42 -04:00