summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake: Teach --build mode to support multiple targetsBartosz Kosiorek2019-03-0536-328/+403
| | | | Fixes: #16136
* cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommandBartosz Kosiorek2019-03-041-14/+1
|
* cmGlobalGenerator: Change case of methods from GeneratedMakeCommand structBartosz Kosiorek2019-03-048-58/+58
|
* cmakemain: Remove ignored --use-stderr option from command line helpBartosz Kosiorek2019-03-041-1/+0
|
* cmGlobalGenerator: Remove unused codeBartosz Kosiorek2019-03-041-11/+0
|
* CMake Nightly Date StampKitware Robot2019-03-041-1/+1
|
* CMake Nightly Date StampKitware Robot2019-03-031-1/+1
|
* CMake Nightly Date StampKitware Robot2019-03-021-1/+1
|
* Merge branch 'release-3.14'Brad King2019-03-010-0/+0
|\
| * CMake 3.14.0-rc3v3.14.0-rc3Brad King2019-03-011-1/+1
| |
* | Merge branch 'release-3.14'Brad King2019-03-010-0/+0
|\ \ | |/
| * Merge branch 'findjni-paths' into release-3.14Brad King2019-03-011-52/+47
| |\ | | | | | | | | | Merge-request: !3042
| * \ Merge branch 'ExternalProject-fix-log-in-custom-stamp' into release-3.14Brad King2019-03-011-2/+14
| |\ \ | | | | | | | | | | | | Merge-request: !3045
| * \ \ Merge branch 'cuda_device_link_handle_frameworks' into release-3.14Brad King2019-03-011-0/+12
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3039
| * \ \ \ Merge branch 'vs2019' into release-3.14Brad King2019-02-282-9/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3044
* | \ \ \ \ Merge topic 'cuda_device_link_handle_frameworks'Brad King2019-03-011-0/+12
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d5d1b15654 CUDA: Filter out -framework arguments during device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3039
| * | | | | CUDA: Filter out -framework arguments during device linkingRobert Maynard2019-02-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The filter in commit e768d96c74 (CUDA: Filter out host link flags during device linking, 2018-10-22, v3.13.0-rc2~4^2~2^2) removes `-framework` but not the framework name that comes after it. Revise the logic to remove both. Fixes: #18911
* | | | | | Merge topic 'ExternalProject-fix-log-in-custom-stamp'Brad King2019-03-011-2/+14
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a6d3fee77c ExternalProject: Restore default log dir with custom stamp dir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3045
| * | | | | ExternalProject: Restore default log dir with custom stamp dirBrad King2019-03-011-2/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b6f6cac378 (ExternalProject: add LOG_DIR option that allows overriding of log location, 2018-10-12, v3.14.0-rc1~515^2~1) the log directory got its own option. The intention was to fall back to the stamp directory by default. However, the implementation actually only falls back to the same default as the stamp directory and does not consider a custom stamp dir. Update the default log dir computation to fall back to whatever is the final selection for the stamp dir. Fixes: #19000
* | | | | Merge topic 'vs2019'Brad King2019-03-012-9/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9a7f3135e Help: Update VS 2019 generator release note for preview 4 00c1120837 VS: Drop workaround needed only for VS 2019 preview 2 and 3 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Egor Pugin <egor.pugin@gmail.com> Merge-request: !3044
| * | | | Help: Update VS 2019 generator release note for preview 4Brad King2019-02-281-1/+1
| | | | |
| * | | | VS: Drop workaround needed only for VS 2019 preview 2 and 3Brad King2019-02-281-8/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | A temporary workaround added by commit 626c51f47b (VS: Update for Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) is no longer needed as of VS 2019 preview 4. Fixes: #18898
* | | | Merge topic 'findjni-paths'Brad King2019-03-011-52/+47
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 77cede0977 FindJNI: Unify path search, fix support for Java 9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3042
| * | | FindJNI: Unify path search, fix support for Java 9Christian Pfeiffer2019-03-011-52/+47
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java 9 restructured the standard location of the AWT libraries due to the removal of the JRE/JDK separation. We should check all possible combinations of subdirectories to the Java root directories to ensure that the libraries will be found after an upgrade. Furthermore, a root directory would contain both, include and library paths, so the search should be unified to ease maintenance on the module.
* | | Merge topic 'doc-install-internal-xref'Brad King2019-03-011-5/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8307adb9f Help: inter-link install() commands 19e15853e9 Help: add inter link anchors for install() commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3034
| * | | Help: inter-link install() commandsNeroBurner2019-02-281-5/+5
| | | |
| * | | Help: add inter link anchors for install() commandsNeroBurner-tux2019-02-281-0/+7
| | | |
* | | | Merge topic 'processor_count_linux_containers'Brad King2019-03-011-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f20eab9cdc ProcessorCount: Return the container CPU count instead of the host count Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3032
| * | | | ProcessorCount: Return the container CPU count instead of the host countSylvain Joubert2019-02-271-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Linux containers (tested with LXC and Docker) getconf returns the host CPU count. Use nproc with a higher priority if available to get the container's allocated CPUs instead of the non-accessible host count.
* | | | | Merge topic 'drop-MIPSpro'Brad King2019-03-011-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e21bae378d WCDH: Restore definition for <prefix>_COMPILER_IS_MIPSpro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3043
| * | | | | WCDH: Restore definition for <prefix>_COMPILER_IS_MIPSproBrad King2019-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code removed for MIPSpro by commit 214fcefa52 (Remove now-unused code once used for MIPSpro on IRIX, 2019-02-21) actually changed a public-facing API by dropping the `<prefix>_COMPILER_IS_MIPSpro` definition from the generated compiler detection header. Restore the definition hard-coded to `0` since the compiler will never be MIPSpro. Reported-by: Hans Johnson <hans-johnson@uiowa.edu>
* | | | | | CMake Nightly Date StampKitware Robot2019-03-011-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'ppc64-toc-overflow'Brad King2019-02-281-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c58a7e4d2 ppc64: Work around TOC overflow with platform specific linker flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3038
| * | | | | ppc64: Work around TOC overflow with platform specific linker flagsChuck Atkins2019-02-271-0/+9
| | | | | |
* | | | | | Merge topic 'doc-xref-EXPORT_NAME'Brad King2019-02-281-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c29a1d58d9 Help: Link from install(TARGET) to EXPORT_NAME to rename exported target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3037
| * | | | | | Help: Link from install(TARGET) to EXPORT_NAME to rename exported targetNeroBurner2019-02-271-0/+2
| |/ / / / /
* | | | | | Merge topic 'doc-EXPORT_NAME'Brad King2019-02-281-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dac7e8b833 Help: Link from EXPORT_NAME to relevant export commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3033
| * | | | | | Help: Link from EXPORT_NAME to relevant export commandsNeroBurner2019-02-271-3/+3
| |/ / / / /
* | | | | | Merge topic 'refactor-handle-path-command'Brad King2019-02-281-24/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9636b03cca cmFileCommand: Refactor HandleCMakePathCommand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2960
| * | | | | | cmFileCommand: Refactor HandleCMakePathCommandArtur Ryt2019-02-261-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make use of cmJoin and fresh cmRange::transform to reduce function complexity. Move conversion logic to named functions.
* | | | | | | Merge topic 'optimize_ge_node_lookup'Brad King2019-02-281-68/+69
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a490ea4a28 cmGeneratorExpressionNode: Initialize node key map in class constructor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3031
| * | | | | | | cmGeneratorExpressionNode: Initialize node key map in class constructorSebastian Holtermann2019-02-271-68/+69
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | By initializing the node map in the class constructor of the static instance we avoid an if-empty check.
* | | | | | | Merge topic 'features-from-default-standard'Brad King2019-02-283-4/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7213ca870 Features: Do not use a lower-than-default standard for requested features Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3023
| * | | | | | | Features: Do not use a lower-than-default standard for requested featuresZsolt Parragi2019-02-263-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `AddRequiredTargetC(xx)` feature didn't take the default compiler standard into account, which possibly resulted in the use of an older standard when some features requested it. Fixes: #18686
* | | | | | | | Merge branch 'release-3.14'Brad King2019-02-280-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'backport-check-std-size-cbegin-cend' into release-3.14Brad King2019-02-272-2/+18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3030
* | \ \ \ \ \ \ \ Merge topic 'check-std-size-cbegin-cend'Brad King2019-02-282-2/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6195989c7 Merge branch 'backport-check-std-size-cbegin-cend' a605bf438e Extend C++17/C++14 feature checks to cover more standard library APIs e17deb7ad4 Extend C++17/C++14 feature checks to cover more standard library APIs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3030
| * \ \ \ \ \ \ \ \ Merge branch 'backport-check-std-size-cbegin-cend'Brad King2019-02-270-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Extend C++17/C++14 feature checks to cover more standard library APIsMathieu Garaud2019-02-272-2/+18
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure `std::cbegin`, `std::cend`, and `std::size` work in C++17 or C++14 mode before choosing the corresponding standard level for compiling CMake itself. This helps in cases that the compiler is using a standard library too old to support the full standard level chosen.
| * | | | | | | | Extend C++17/C++14 feature checks to cover more standard library APIsMathieu Garaud2019-02-272-2/+18
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure `std::cbegin`, `std::cend`, and `std::size` work in C++17 or C++14 mode before choosing the corresponding standard level for compiling CMake itself. This helps in cases that the compiler is using a standard library too old to support the full standard level chosen.