Commit Graph

35960 Commits

Author SHA1 Message Date
Daniel Pfeifer
587084052b cmState: introduce methods for adding builtin commands 2017-05-11 19:49:06 +02: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
20c838da6b Merge topic 'sunpro-fpp-fix'
1cd40bd2 SunPro: Use -fpp to process all files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !826
2017-05-11 09:59:47 -04:00
Brad King
66b81d8ddd Merge topic 'fix-typo-in-pgi-lang-std'
67c9f479 PGI: Fix typo in compiler version test for language standards

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !825
2017-05-11 09:59:04 -04:00
Brad King
4c638930b3 Merge topic 'print-function-server-tests'
a8f04a6f Tests/Server: import print_function from the future

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Matt Soucy <matthew.soucy@baesystems.com>
Merge-request: !822
2017-05-11 09:57:43 -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
e736dd9389 Merge topic 'TestDriver-remove-unused-init'
608cc887 TestDriver: Remove unused local variable initialization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !824
2017-05-11 09:55:44 -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
Christian Pfeiffer
1cd40bd226 SunPro: Use -fpp to process all files
By using only -F, SunPro does not process files that don't have a .F or
.F90 extension. This means that the preprocess rules don't quite work as
expected, for instance breaking the Ninja generator's behavior during
cmake_ninja_depends.
2017-05-10 19:33:48 +02:00
Chuck Atkins
67c9f47901 PGI: Fix typo in compiler version test for language standards 2017-05-10 12:25:44 -05:00
Brad King
608cc887c7 TestDriver: Remove unused local variable initialization 2017-05-10 10:01:15 -04:00
Daniel Pfeifer
fdd341ebfd cmFindCommon: remove unused function SetMakefile 2017-05-10 15:58:28 +02:00
Ben Boeckel
a8f04a6f9c Tests/Server: import print_function from the future
This makes the output much more readable.

Suggested-by: Matt Soucy
2017-05-10 09:42:31 -04: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
8cc9e07a2c Merge topic 'sunpro-c++11-link'
d49aa107 Features: On SunPro link feature check with lang std flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !818
2017-05-10 09:36:16 -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
882ef5f33f Merge topic 'test-lang-fix'
9b541aae TestFindOpenMP,MPI: Disable default languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !816
2017-05-10 09:26:10 -04:00
Brad King
8c2a369105 Merge topic 'findopenmp-new-search'
80ca9ac8 FindOpenMP: Cache compilation results
ec5c6bc9 FindOpenMP: Refine list of flags to try

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !815
2017-05-10 09:25:47 -04:00
Brad King
07e30f082c Merge topic 'doc-HEADER_FILE_ONLY-use-case'
32400110 Help: Document HEADER_FILE_ONLY use case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !812
2017-05-10 09:25:07 -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
Daniel Pfeifer
0c519c7029 bootstrap: Remove leftovers from cmBootstrapCommands 2017-05-09 23:45:29 +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
Roman Lebedev
32400110fe Help: Document HEADER_FILE_ONLY use case
Describe how to get sources into IDE project files.
2017-05-09 11:46:29 -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
Brad King
fcf60ec1bc Merge topic 'test-macos-framework-type-universal-binary'
59f84452 Tests: Fix RunCMake.Framework expectation for universal binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !814
2017-05-09 11:37:15 -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
d49aa10768 Features: On SunPro link feature check with lang std flag
Follow up commit e17b179184 (Features: On SunPro link with language
standard compiler flag, 2017-04-28) to apply the same fix to the feature
checks.  The `try_compile` used for these is intentionally not using
`CXX_STANDARD`-based logic so that it can test the individual flags.
2017-05-09 11:22:18 -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
Christian Pfeiffer
9b541aaeaa TestFindOpenMP,MPI: Disable default languages 2017-05-08 21:43:01 +02:00
Christian Pfeiffer
80ca9ac84b FindOpenMP: Cache compilation results 2017-05-08 18:52:48 +02:00
Christian Pfeiffer
ec5c6bc9bc FindOpenMP: Refine list of flags to try 2017-05-08 18:26:17 +02:00
Brad King
59f8445219 Tests: Fix RunCMake.Framework expectation for universal binaries
While at it, replace `\n` in with a real newline because such escape
sequences are not processed in this context.
2017-05-08 11:38:23 -04:00
Brad King
2731a91c98 Update SunPro flags used for CMake itself to support C++11 2017-05-08 10:53:46 -04:00
Brad King
86edc5b6a5 Choose compiler-specific flags earlier in CMake's own build
Add the flags early enough be used in the checks for C++ features.
2017-05-08 10:26:48 -04: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