mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-26 00:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity
44,016 Commits 2 Branches 386 Tags
021d147d26cb332f88e90d8a2dca9ff940942b7a
Commit Graph

26828 Commits

Author SHA1 Message Date
Brad King
021d147d26 Merge topic 'qt-5.13' 
963ddafeaa QtDialog: Use QPalette::WindowText instead of QPalette::Foreground
1a2d6bdefc Tests: Autogen: Use valid rcc compression levels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3500
 2019-07-02 08:39:38 -04:00
Brad King
41acd44625 Merge topic 'cuda-no-device-link-when-disabled' 
a4d502a5bf CUDA: Do not device link if CUDA is not an enabled language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3491
 2019-07-02 08:36:56 -04:00
Kitware Robot
9fad9b56f8 CMake Nightly Date Stamp 2019-07-02 00:01:08 -04:00
Brad King
fccc59c38c Merge topic 'remove_unneeded_variables_from_cmFindPackageCommand' 
96b10e47be Remove unused variables from cmFindPackageCommand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3488
 2019-07-01 09:59:51 -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
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
56f5310112 Merge topic 'bug/19436' 
822abf1265 list(POP_FRONT): Fix always assigning first item to output vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3497
 2019-07-01 07:42:04 -04:00
Kitware Robot
477a1ae478 CMake Nightly Date Stamp 2019-07-01 00:01:05 -04: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
Kitware Robot
dae77e069e CMake Nightly Date Stamp 2019-06-30 00:01:06 -04:00
Kitware Robot
2b1d9e51c2 CMake Nightly Date Stamp 2019-06-29 00:01:05 -04:00
Kitware Robot
3b90096838 CMake Nightly Date Stamp 2019-06-28 00:01:07 -04:00
Brad King
3327fe948e Merge topic 'vs-dpi-aware' 
cd92f8f8bf VS: Add VS_DPI_AWARE target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3418
 2019-06-27 08:56:41 -04:00
Brad King
753373579e CMake 3.15.0-rc3 2019-06-27 07:35:14 -04:00
Brad King
6ddc0b4438 Merge topic 'cuda-msvc-runtime-library' 
8fbd25772f CUDA: Implement MSVC runtime library abstraction
07807a2006 VS: Use AddLanguageFlags to de-duplicate CMAKE_{CUDA,ASM*}_FLAGS lookup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3485
 2019-06-27 07:30:01 -04:00
Kitware Robot
454a6250ca CMake Nightly Date Stamp 2019-06-27 00:01:06 -04:00
Robert Maynard
96b10e47be Remove unused variables from cmFindPackageCommand 2019-06-26 16:06:21 -04:00
Matt Weir
cd92f8f8bf VS: Add VS_DPI_AWARE target property 
Enables setting the visual studio project property for Manifests,
controlling the DPI Aware setting.
 2019-06-26 09:55:49 -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
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
06f1560a58 Merge topic 'build-install-rpath-genex' 
d29ed8a114 BUILD_RPATH/INSTALL_RPATH: Add generator expression support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3481
 2019-06-26 07:14:04 -04:00
Brad King
9b68e4b183 Merge topic 'implicit-includes-realpath' 
d88b38d05d Normalize paths when checking for implicit include dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3467
 2019-06-26 07:13:24 -04:00
Brad King
2919f65c24 Merge topic 'fix-xcode6-compilation' 
1ff1f75718 Fix Xcode 6.1.1 compilation issue

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3480
 2019-06-26 07:08:36 -04:00
Brad King
30eee7702f Merge topic 'export-targets-empty' 
2ba5c37b3f export: Restore support for empty TARGETS list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3484
 2019-06-26 07:03:25 -04:00
Brad King
c864765496 Merge topic 'ninja-nvcc-rsp' 
eda4c43879 Ninja: Fix CUDA device linking when using response files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3482
 2019-06-26 07:02:11 -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
Kitware Robot
b598c64954 CMake Nightly Date Stamp 2019-06-26 00:01:07 -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
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
Raffi Enficiaud
1ff1f75718 Fix Xcode 6.1.1 compilation issue 2019-06-25 17:34:56 +02:00
Kyle Edwards
d29ed8a114 BUILD_RPATH/INSTALL_RPATH: Add generator expression support 
Fixes: #19423
 2019-06-25 10:55:03 -04:00
Brad King
dba8086f58 Merge topic 'refactor/use-unique_ptr' 
5e52de7d57 modermize: replace some raw pointers w/ `unique_ptr`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3465
 2019-06-25 07:13:38 -04:00
Kitware Robot
edf232dbe4 CMake Nightly Date Stamp 2019-06-25 00:01:07 -04:00
Alex Turbov
5e52de7d57 modermize: replace some raw pointers w/ unique_ptr 2019-06-24 09:36:09 -04:00
Brad King
1ba0cd2967 Merge topic 'vs-ce-deploy' 
7035bdeb52 VS10Generator: add project properties to enable WindowsCE deployment.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3462
 2019-06-24 08:25:41 -04:00
Kitware Robot
a639464691 CMake Nightly Date Stamp 2019-06-24 00:01:05 -04:00
Kitware Robot
0ecf3ef9e8 CMake Nightly Date Stamp 2019-06-23 00:01:06 -04:00
Daniel Scharrer
d88b38d05d Normalize paths when checking for implicit include dirs 
GCC replaces implicit include directories with user-supplied ones if
they point to the same directory, even if the path strings differ.
 2019-06-22 23:09:17 +02:00
Kitware Robot
f2bce265b7 CMake Nightly Date Stamp 2019-06-22 00:01:08 -04:00
Brad King
12c65a52bd Merge topic 'find-control-vars' 
02f527c66a Find: Provide global controls for the `NO_[]_PATH` call options
f0a89149bc RunCMake: Automatically support platform out override files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3444
 2019-06-21 11:07:56 -04:00
Robert Maynard
02f527c66a Find: Provide global controls for the NO_[]_PATH call options 2019-06-21 11:06:39 -04:00
Kitware Robot
512013e276 CMake Nightly Date Stamp 2019-06-21 00:01:07 -04:00
Kitware Robot
3e1dac7391 CMake Nightly Date Stamp 2019-06-20 00:01:07 -04:00
Wil Stark
7035bdeb52 VS10Generator: add project properties to enable WindowsCE deployment. 
Fixes: #19408
 2019-06-19 15:11:57 -07:00
Brad King
5c7880956f CMake 3.15.0-rc2 2019-06-19 08:33:48 -04:00
Brad King
631fe145e6 Merge topic 'generated_export_remove_duplicate_required_cmake_lines' 
5d8f1a8421 Export: A singular CMake version written for interface targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3458
 2019-06-19 07:23:40 -04:00
Kitware Robot
c9f284c736 CMake Nightly Date Stamp 2019-06-19 00:01:05 -04:00
Brad King
1b5a7adf5e Merge topic 'library-search-paths' 
2746c61e6d Swift: Add library search paths for dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3436
 2019-06-18 07:57:56 -04:00
Kitware Robot
db7fc1e045 CMake Nightly Date Stamp 2019-06-18 00:01:07 -04:00
Robert Maynard
5d8f1a8421 Export: A singular CMake version written for interface targets 2019-06-17 17:38:46 -04:00