summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'split-sysroot'Brad King2017-05-1113-11/+93
|\ | | | | | | | | | | | | 53e89b6a Add options for separate compile and link sysroots Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !819
| * Add options for separate compile and link sysrootsBrad King2017-05-0913-11/+93
| | | | | | | | | | | | | | | | | | 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>
* | Merge topic 'sunpro-fpp-fix'Brad King2017-05-111-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 1cd40bd2 SunPro: Use -fpp to process all files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !826
| * | SunPro: Use -fpp to process all filesChristian Pfeiffer2017-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'fix-typo-in-pgi-lang-std'Brad King2017-05-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 67c9f479 PGI: Fix typo in compiler version test for language standards Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !825
| * | | PGI: Fix typo in compiler version test for language standardsChuck Atkins2017-05-101-1/+1
| |/ /
* | | Merge topic 'print-function-server-tests'Brad King2017-05-112-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Tests/Server: import print_function from the futureBen Boeckel2017-05-102-2/+4
| | |/ | |/| | | | | | | | | | | | | This makes the output much more readable. Suggested-by: Matt Soucy
* | | Merge topic 'cpackifw-access-refactoring'Brad King2017-05-115-558/+583
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 543cf134 CPackIFW: Access refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !820
| * | | CPackIFW: Access refactoringKonstantin Podsvirov2017-05-095-558/+583
| |/ / | | | | | | | | | | | | | | | Changes: - Access members with this->; - Access nested enum values with class name.
* | | Merge topic 'TestDriver-remove-unused-init'Brad King2017-05-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 608cc887 TestDriver: Remove unused local variable initialization Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !824
| * | | TestDriver: Remove unused local variable initializationBrad King2017-05-101-1/+1
| | |/ | |/|
* | | Merge topic 'CMP0069-no-warn-try_compile'Brad King2017-05-111-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 469813cc CMP0069: Suppress warning if we are in 'try_compile' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !823
| * | | CMP0069: Suppress warning if we are in 'try_compile'Ruslan Baratov2017-05-101-1/+3
| | | | | | | | | | | | | | | | Fixes: #16855
* | | | Merge topic 'dead-code-removal'Brad King2017-05-1113-42/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | cmFindCommon: remove unused function SetMakefileDaniel Pfeifer2017-05-102-15/+0
| | | | |
| * | | | cmExecutionStatus: Remove arguments from settersDaniel Pfeifer2017-05-0910-25/+32
| | | | | | | | | | | | | | | | | | | | | | | | | The setters are only used to set boolean values. The values are never reset individually.
| * | | | bootstrap: Remove leftovers from cmBootstrapCommandsDaniel Pfeifer2017-05-091-2/+0
| | |_|/ | |/| |
* | | | CMake Nightly Date StampKitware Robot2017-05-111-1/+1
| |_|/ |/| |
* | | Merge topic 'sunpro-c++11-link'Brad King2017-05-101-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d49aa107 Features: On SunPro link feature check with lang std flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !818
| * | | Features: On SunPro link feature check with lang std flagBrad King2017-05-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'vs-project-guid'Brad King2017-05-102-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 776929b3 VS: Fix .vcxproj ProjectGuid element case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !817
| * | | | VS: Fix .vcxproj ProjectGuid element caseBrad King2017-05-092-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'test-lang-fix'Brad King2017-05-102-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b541aae TestFindOpenMP,MPI: Disable default languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !816
| * | | | | TestFindOpenMP,MPI: Disable default languagesChristian Pfeiffer2017-05-082-2/+2
| |/ / / /
* | | | | Merge topic 'findopenmp-new-search'Brad King2017-05-101-17/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80ca9ac8 FindOpenMP: Cache compilation results ec5c6bc9 FindOpenMP: Refine list of flags to try Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !815
| * | | | | FindOpenMP: Cache compilation resultsChristian Pfeiffer2017-05-081-12/+10
| | | | | |
| * | | | | FindOpenMP: Refine list of flags to tryChristian Pfeiffer2017-05-081-5/+10
| |/ / / /
* | | | | Merge topic 'doc-HEADER_FILE_ONLY-use-case'Brad King2017-05-103-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32400110 Help: Document HEADER_FILE_ONLY use case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !812
| * | | | | Help: Document HEADER_FILE_ONLY use caseRoman Lebedev2017-05-093-0/+22
| |/ / / / | | | | | | | | | | | | | | | Describe how to get sources into IDE project files.
* | | | | Merge topic 'ninja-windows-command-concat'Brad King2017-05-103-1/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e0e03d9 Ninja: Fix command concatenation on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !801
| * | | | | Ninja: Fix command concatenation on WindowsBernhard Burgermeister2017-05-093-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'separate-command-registration'Brad King2017-05-1073-301/+106
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | cmCommand: remove IsScriptableDaniel Pfeifer2017-05-0848-232/+0
| | | | | |
| * | | | | cmState: remove RemoveUnscriptableCommandsDaniel Pfeifer2017-05-084-22/+0
| | | | | |
| * | | | | cmMakefile: don't check IsScriptableDaniel Pfeifer2017-05-081-14/+1
| | | | | |
| * | | | | cmake: register fake project commands in -P modeDaniel Pfeifer2017-05-083-0/+64
| | | | | |
| * | | | | cmake: initialize with Role that controls which commands to registerDaniel Pfeifer2017-05-0820-27/+41
| | | | | |
| * | | | | ctest: remove unused cmake instanceDaniel Pfeifer2017-05-081-6/+0
| | |/ / / | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2017-05-101-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'suncc-cxx11'Brad King2017-05-093-9/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Update SunPro flags used for CMake itself to support C++11Brad King2017-05-082-5/+16
| | | | |
| * | | | Choose compiler-specific flags earlier in CMake's own buildBrad King2017-05-081-3/+4
| | | | | | | | | | | | | | | | | | | | Add the flags early enough be used in the checks for C++ features.
| * | | | cmBase32: Cast pointer subtraction result to size explicitlyBrad King2017-05-081-1/+1
| |/ / / | | | | | | | | | | | | The SunPro 5.13 compiler with `-std=c++11` complains otherwise.
* | | | Merge topic 'test-macos-framework-type-universal-binary'Brad King2017-05-092-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59f84452 Tests: Fix RunCMake.Framework expectation for universal binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !814
| * | | | Tests: Fix RunCMake.Framework expectation for universal binariesBrad King2017-05-082-2/+5
| |/ / / | | | | | | | | | | | | | | | | While at it, replace `\n` in with a real newline because such escape sequences are not processed in this context.
* | | | CMake Nightly Date StampKitware Robot2017-05-091-1/+1
|/ / /
* | | Merge topic 'c++11-iwyu'Brad King2017-05-0811-45/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | QtDialog: block include-what-you-useDaniel Pfeifer2017-05-051-0/+6
| | | |
| * | | cmServer: include what you useDaniel Pfeifer2017-05-058-45/+43
| | | |