Commit Graph

22811 Commits

Author SHA1 Message Date
Kitware Robot
1867856f6a CMake Nightly Date Stamp 2017-05-16 00:01:05 -04:00
Brad King
dd89b24b9b Merge topic 'autogen_settings'
b95fbbe5 Autogen: Add -DWIN32 to definitions list on demand
ab39dd11 Autogen: Include moc/uic/rcc binary in settings hash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !836
2017-05-15 10:57:20 -04:00
Brad King
bedd098a65 Merge topic 'cpack-components-handle-symlinks'
26384068 CPack test symlinks in package
6949b71f CPack unify component/monolithic package symlink handling
3eb0f080 Improved CPack tests error logging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !841
2017-05-15 10:55:58 -04:00
Kitware Robot
52fbae0a59 CMake Nightly Date Stamp 2017-05-15 00:01:03 -04:00
Domen Vrankar
6949b71ff1 CPack unify component/monolithic package symlink handling
Non component package generation was recursing through
symlinks while monolithic package generation did not.
This was causing component archive packages to contain
both symlink and a directory with the same name on the
same level if symlink contained files which caused errors
during extraction of such packages.

Closes #16051
2017-05-14 23:45:18 +02:00
Kitware Robot
0816ebcc07 CMake Nightly Date Stamp 2017-05-14 00:01:04 -04:00
Sebastian Holtermann
b95fbbe553 Autogen: Add -DWIN32 to definitions list on demand 2017-05-13 10:25:46 +02:00
Sebastian Holtermann
ab39dd11f5 Autogen: Include moc/uic/rcc binary in settings hash 2017-05-13 10:14:23 +02:00
Kitware Robot
9d5fecde6a CMake Nightly Date Stamp 2017-05-13 00:01:09 -04:00
Brad King
836cb52e9a Merge topic 'command-name'
a1218f59 cmCommand: remove unused methods from interface and all implementations
4ba25a82 cmState: separate builtin and scripted commands
a44dab46 cmState: introduce method for adding scripted commands
c734c850 CTest: use new methods for builtin commands
bd14e464 cmCommands: use new methods for builtin commands
58708405 cmState: introduce methods for adding builtin commands
a890ca2f cmakemain: use script role for -P

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !829
2017-05-12 09:13:51 -04:00
Brad King
592206a157 Merge topic 'add_cuda_cxx14_flag'
036ffe81 CUDA: Add support for the C++14 standard flag.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !830
2017-05-12 09:13:19 -04:00
Kitware Robot
91d987e15c CMake Nightly Date Stamp 2017-05-12 00:01:04 -04:00
Daniel Pfeifer
a1218f59d9 cmCommand: remove unused methods from interface and all implementations 2017-05-11 19:49:06 +02:00
Daniel Pfeifer
4ba25a823e cmState: separate builtin and scripted commands 2017-05-11 19:49:06 +02:00
Daniel Pfeifer
a44dab461f cmState: introduce method for adding scripted commands 2017-05-11 19:49:06 +02:00
Daniel Pfeifer
c734c8501b CTest: use new methods for builtin commands 2017-05-11 19:49:06 +02:00
Daniel Pfeifer
bd14e46400 cmCommands: use new methods for builtin commands 2017-05-11 19:49:06 +02:00
Daniel Pfeifer
587084052b cmState: introduce methods for adding builtin commands 2017-05-11 19:49:06 +02:00
Robert Maynard
036ffe815a CUDA: Add support for the C++14 standard flag.
CUDA 9 toolkit has announced support for C++14 flag, so lets allow users
to use it.
2017-05-11 13:42:42 -04:00
Daniel Pfeifer
a890ca2f8d cmakemain: use script role for -P 2017-05-11 17:57:59 +02:00
Brad King
8e2f3582eb Merge topic 'split-sysroot'
53e89b6a Add options for separate compile and link sysroots

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !819
2017-05-11 10:00:12 -04:00
Brad King
c2ea011830 Merge topic 'cpackifw-access-refactoring'
543cf134 CPackIFW: Access refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !820
2017-05-11 09:56:49 -04:00
Brad King
9b79d2a357 Merge topic 'CMP0069-no-warn-try_compile'
469813cc CMP0069: Suppress warning if we are in 'try_compile'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !823
2017-05-11 09:55:12 -04:00
Brad King
99b1ff714b Merge topic 'dead-code-removal'
fdd341eb cmFindCommon: remove unused function SetMakefile
67a8d907 cmExecutionStatus: Remove arguments from setters
0c519c70 bootstrap: Remove leftovers from cmBootstrapCommands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !821
2017-05-11 09:54:19 -04:00
Kitware Robot
f1b9fe5fc4 CMake Nightly Date Stamp 2017-05-11 00:01:06 -04:00
Daniel Pfeifer
fdd341ebfd cmFindCommon: remove unused function SetMakefile 2017-05-10 15:58:28 +02:00
Ruslan Baratov
469813cce0 CMP0069: Suppress warning if we are in 'try_compile'
Fixes: #16855
2017-05-10 09:41:40 -04:00
Brad King
d43eb3aec2 Merge topic 'vs-project-guid'
776929b3 VS: Fix .vcxproj ProjectGuid element case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !817
2017-05-10 09:27:10 -04:00
Brad King
8a19ce4767 Merge topic 'ninja-windows-command-concat'
5e0e03d9 Ninja: Fix command concatenation on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !801
2017-05-10 09:23:43 -04:00
Brad King
53f1f55599 Merge topic 'separate-command-registration'
44c0b2b7 cmCommand: remove IsScriptable
da8faa8c cmState: remove RemoveUnscriptableCommands
c3f41af2 cmMakefile: don't check IsScriptable
c2c2bbb3 cmake: register fake project commands in -P mode
c36d63cd cmake: initialize with Role that controls which commands to register
8986dec0 ctest: remove unused cmake instance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !714
2017-05-10 09:22:46 -04:00
Kitware Robot
730cd10c64 CMake Nightly Date Stamp 2017-05-10 00:01:04 -04:00
Daniel Pfeifer
67a8d907ad cmExecutionStatus: Remove arguments from setters
The setters are only used to set boolean values.  The values are never
reset individually.
2017-05-09 23:49:14 +02:00
Konstantin Podsvirov
543cf13406 CPackIFW: Access refactoring
Changes:
- Access members with this->;
- Access nested enum values with class name.
2017-05-10 00:29:18 +03:00
Brad King
53e89b6ab0 Add options for separate compile and link sysroots
Add `CMAKE_SYSROOT_COMPILE` and `CMAKE_SYSROOT_LINK` variables to as
operation-specific alternatives to `CMAKE_SYSROOT`.  This will be useful
for Android NDKs that compile and link with different sysroot values
(e.g. `r14` with unified headers).

Co-Author: Florent Castelli <florent.castelli@gmail.com>
2017-05-09 14:21:54 -04:00
Brad King
b69e061b80 Merge topic 'suncc-cxx11'
2731a91c Update SunPro flags used for CMake itself to support C++11
86edc5b6 Choose compiler-specific flags earlier in CMake's own build
7b2d529b cmBase32: Cast pointer subtraction result to size explicitly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !813
2017-05-09 11:37:35 -04:00
Bernhard Burgermeister
5e0e03d953 Ninja: Fix command concatenation on Windows
Put commands that contain `||` into brackets to avoid early abort of
execution by `cmd.exe` because `||` has higher precedence than `&&` in
`cmd.exe`.

Add test to check for command execution after `||` as part of a
parameter and as command separator.

Fixes: #16850
2017-05-09 11:34:42 -04:00
Brad King
776929b3c4 VS: Fix .vcxproj ProjectGuid element case
The `.vcxproj` file format expects `ProjectGuid`, not `ProjectGUID`.
The latter is expected by `.vcproj` files from VS 2008, so this was
likely a typo when the VS 2010 generator was first introduced.

Fixes: #11968
2017-05-09 10:12:12 -04:00
Kitware Robot
1019789f2a CMake Nightly Date Stamp 2017-05-09 00:01:04 -04:00
Daniel Pfeifer
44c0b2b75a cmCommand: remove IsScriptable 2017-05-08 22:58:01 +02:00
Daniel Pfeifer
da8faa8c7e cmState: remove RemoveUnscriptableCommands 2017-05-08 22:58:01 +02:00
Daniel Pfeifer
c3f41af2be cmMakefile: don't check IsScriptable 2017-05-08 22:58:01 +02:00
Daniel Pfeifer
c2c2bbb3d4 cmake: register fake project commands in -P mode 2017-05-08 22:58:01 +02:00
Daniel Pfeifer
c36d63cd48 cmake: initialize with Role that controls which commands to register 2017-05-08 22:29:44 +02:00
Daniel Pfeifer
8986dec05d ctest: remove unused cmake instance 2017-05-08 22:29:44 +02:00
Brad King
7b2d529bde cmBase32: Cast pointer subtraction result to size explicitly
The SunPro 5.13 compiler with `-std=c++11` complains otherwise.
2017-05-08 10:26:36 -04:00
Brad King
22d0a83a4c Merge topic 'c++11-iwyu'
50dd15af QtDialog: block include-what-you-use
f3e21613 cmServer: include what you use
9535823b IWYU: map system symbols to libuv
6a91ee02 IWYU: add mapping for cm::auto_ptr
7165065f cmInstalledFile: add cmConfigure.h as first #include

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !811
2017-05-08 10:03:15 -04:00
Brad King
830637192d Merge topic 'clazy-cleanup'
422359fe CMakeSetupDialog: use multi-arg
1ffe47e3 QCMakeCacheView: prever QVector over QList
726b3b6f QtDialog: add reference in foreach
377d4df2 QCMakeCacheView: avoid temporary containers for iteration
a57b30bb QtDialog: add missing emit keywords
7a0e2392 cmFileMonitor: use cmDeleteAll

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !805
2017-05-08 09:46:58 -04:00
Kitware Robot
033eafcf44 CMake Nightly Date Stamp 2017-05-08 00:01:05 -04:00
Kitware Robot
41f479467b CMake Nightly Date Stamp 2017-05-07 00:01:03 -04:00
Kitware Robot
17981e0946 CMake Nightly Date Stamp 2017-05-06 00:01:04 -04:00