summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GoogleTest: Expand capabilities of gtest_add_tests()Craig Scott2017-05-1511-27/+302
| | | | | | | | Now has keyword-based arguments (old syntax form is still supported). Discovered tests can have a prefix and/or suffix added to the test names and the list of discovered tests is available to the caller. The working dir can also be set and the dependency on the source files is now optional instead of mandatory.
* Merge topic 'command-name'Brad King2017-05-12119-796/+268
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * cmCommand: remove unused methods from interface and all implementationsDaniel Pfeifer2017-05-11113-571/+7
| |
| * cmState: separate builtin and scripted commandsDaniel Pfeifer2017-05-112-70/+52
| |
| * cmState: introduce method for adding scripted commandsDaniel Pfeifer2017-05-115-10/+10
| |
| * CTest: use new methods for builtin commandsDaniel Pfeifer2017-05-113-27/+26
| |
| * cmCommands: use new methods for builtin commandsDaniel Pfeifer2017-05-111-132/+156
| |
| * cmState: introduce methods for adding builtin commandsDaniel Pfeifer2017-05-113-0/+29
| |
| * cmakemain: use script role for -PDaniel Pfeifer2017-05-111-1/+3
| |
* | Merge topic 'getprerequisites-fix'Brad King2017-05-121-1/+5
|\ \ | | | | | | | | | | | | | | | | | | e0e414d6 GetPrerequisites: Only recurse on resolved unseen prerequisites Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !804
| * | GetPrerequisites: Only recurse on resolved unseen prerequisitesGuillaume Dumont2017-05-111-1/+5
| |/ | | | | | | | | | | | | | | I encountered an issue where not all prerequisites would be listed by `get_prerequisites` since some of the prerequisites cannot be resolved and are added to the list of unseen prerequisites. This has the side effect of clearing the list of `prerequisites_var` and thus removes some prerequisites from the list. Fix it.
* | Merge topic 'add_cuda_cxx14_flag'Brad King2017-05-122-0/+7
|\ \ | | | | | | | | | | | | | | | | | | 036ffe81 CUDA: Add support for the C++14 standard flag. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !830
| * | CUDA: Add support for the C++14 standard flag.Robert Maynard2017-05-112-0/+7
| | | | | | | | | | | | | | | CUDA 9 toolkit has announced support for C++14 flag, so lets allow users to use it.
* | | Merge topic 'sunpro-c-features'Brad King2017-05-124-1/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5d13fe28 Features: Record features for SunPro C 5.13 and 5.14 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !832
| * | | Features: Record features for SunPro C 5.13 and 5.14Brad King2017-05-114-1/+41
| | |/ | |/|
* | | Merge topic 'update-curl'Brad King2017-05-12114-2211/+3604
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95d3ebcc curl: Set TLS/SSL build options the way we need for CMake 11ba72c6 curl: Skip building docs within CMake 29997590 Merge branch 'upstream-curl' into update-curl fd7d521c curl 2017-04-19 (d957e218) 5af9c8e2 curl: Update script to get curl 7.54.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !828
| * | | curl: Set TLS/SSL build options the way we need for CMakeBrad King2017-05-111-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | Restore settings to match what we had before resolving conflicts in the latest update. Use native APIs on Windows and Apple. Pass CA bundle/path options.
| * | | curl: Skip building docs within CMakeBrad King2017-05-111-0/+5
| | | |
| * | | Merge branch 'upstream-curl' into update-curlBrad King2017-05-11113-2211/+3567
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2017-04-19 (d957e218) Resolve conflicts in `CMakeLists.txt` in favor of the upstream version. We will re-apply our logic as needed in following commits.
| | * | | curl 2017-04-19 (d957e218)Curl Upstream2017-05-11115-2193/+3568
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit d957e2189fdc73cef0ff3d1fb58043d354754449 (curl-7_54_0).
| * | | | curl: Update script to get curl 7.54.0Brad King2017-05-111-1/+2
| | |/ / | |/| |
* | | | Merge topic 'lexerparser-fix-bootstrap'Brad King2017-05-121-13/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1e8f27f bootstrap: fix Bad substitution Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !831
| * | | | bootstrap: fix Bad substitutionDaniel Pfeifer2017-05-111-13/+24
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2017-05-121-1/+1
|/ / /
* | | 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