summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-libuv'Brad King2020-04-3032-377/+842
|\ | | | | | | | | | | | | | | | | 2628eb7460 libuv: Add proctitle and threadpool cleanup stubs to cmake-bootstrap.c efdd451f4b Merge branch 'upstream-libuv' into update-libuv d355f401d7 libuv 2020-04-29 (e7ebae26) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4687
| * libuv: Add proctitle and threadpool cleanup stubs to cmake-bootstrap.cBrad King2020-04-291-0/+6
| | | | | | | | | | These are now called by `uv_library_shutdown` in `src/uv-common.c` but on UNIX we do not compile those features during CMake bootstrap.
| * Merge branch 'upstream-libuv' into update-libuvBrad King2020-04-2931-377/+836
| |\ | | | | | | | | | | | | * upstream-libuv: libuv 2020-04-29 (e7ebae26)
| | * libuv 2020-04-29 (e7ebae26)libuv upstream2020-04-2931-378/+837
| | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit e7ebae26247d2fee0a04547eb7f9aa8f78d4a642 (v1.x).
* | | Merge branch 'release-3.17'Brad King2020-04-300-0/+0
|\ \ \
| * \ \ Merge topic 'FindPython-fphsa' into release-3.17Brad King2020-04-301-7/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84bd62a6d7 FindPython: fix error on FPHSA call Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4685
* | \ \ \ Merge topic 'FindPython-fphsa'Brad King2020-04-301-20/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94f060b5d0 Merge branch 'backport-3.17-FindPython-fphsa' into FindPython-fphsa e67dba730e FindPython: fix error on FPHSA call 84bd62a6d7 FindPython: fix error on FPHSA call Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4685
| * \ \ \ \ Merge branch 'backport-3.17-FindPython-fphsa' into FindPython-fphsaMarc Chevrier2020-04-290-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | FindPython: fix error on FPHSA callMarc Chevrier2020-04-291-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20650
| * | | | | FindPython: fix error on FPHSA callMarc Chevrier2020-04-291-20/+20
| | |_|/ / | |/| | |
* | | | | Merge branch 'release-3.17'Brad King2020-04-300-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'cm_cxx_features-libhugetlbfs' into release-3.17Brad King2020-04-301-0/+2
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 4ab0d37b41 cm_cxx_features: Filter out libhugetlbfs warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4681
* | | | | Merge topic 'cm_cxx_features-libhugetlbfs'Brad King2020-04-301-0/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 4ab0d37b41 cm_cxx_features: Filter out libhugetlbfs warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4681
| * | | | cm_cxx_features: Filter out libhugetlbfs warningsJennifer Green2020-04-291-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, CMake fails to build on Cray systems with a craype-hugepages modulefile loaded on the front-end due to libhugetlbfs warnings breaking the CXX Feature tests. Filter out the warnings so the bootstrap can proceed to successfully install CMake on Cray Linux systems. Fixes: #20645
* | | | Merge topic 'doc-PROJECT_SOURCE_DIR'Craig Scott2020-04-301-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd6e437e3e Help: Clarify the use of PROJECT_SOURCE_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4680
| * | | | Help: Clarify the use of PROJECT_SOURCE_DIRNicolas Bock2020-04-291-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value of the PROJECT_SOURCE_DIR variable is not always the source directory of the "most recent project command". If the project was included via add_subdirectory, variable scoping will prevent this value to change in the parent scope. Signed-off-by: Nicolas Bock <nicolasbock@gmail.com>
* | | | | CMake Nightly Date StampKitware Robot2020-04-301-1/+1
| | | | |
* | | | | Merge topic 'vs_platform_toolset'Brad King2020-04-297-2/+68
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 197b4cbe18 VS: Add option for per-target PlatformToolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4682
| * | | | VS: Add option for per-target PlatformToolsetJulien Jemine2020-04-297-2/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `VS_PLATFORM_TOOLSET` target property to set `PlatformToolset` in the `.vcxproj` file for specific targets. Document that this is safe only when the named toolset uses the same underlying compiler as the primary toolset. Fixes: #17429
* | | | | Merge topic 'FindLibXslt-targets'Brad King2020-04-297-3/+157
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a90ef5a44 FindLibXslt: use LIBXSLT_LIBRARY as cache variable 1aa7df4114 FindLibXslt: provide imported targets dd506714f4 FindLibXslt: identify libexslt include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4650
| * | | | | FindLibXslt: use LIBXSLT_LIBRARY as cache variableMarkus Rickert2020-04-281-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use LIBXSLT_LIBRARY as cache variable instead of LIBXSLT_LIBRARIES to adhere to documented conventions. Check for defined LIBXSLT_LIBRARIES value to support backwards compatibility.
| * | | | | FindLibXslt: provide imported targetsMarkus Rickert2020-04-287-2/+134
| | | | | |
| * | | | | FindLibXslt: identify libexslt include directoryMarkus Rickert2020-04-281-0/+15
| | | | | |
* | | | | | Merge topic 'FindVulkan-env-sdk-first'Brad King2020-04-291-6/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c40e5ddb4 FindVulkan: Prefer VULKAN_SDK env var before standard paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4663
| * | | | | | FindVulkan: Prefer VULKAN_SDK env var before standard pathspheonix xx2020-04-281-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference the environment variable as HINTS instead of PATHS. Fixes: #20637
* | | | | | | Merge topic 'openwatcom-platform-independence'Brad King2020-04-294-109/+123
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3640dbdd5 OpenWatcom: Organize and update C/C++ toolchain command lines 7aa9e89b1c OpenWatcom: Move non-Windows settings to Modules/Compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4666
| * | | | | | | OpenWatcom: Organize and update C/C++ toolchain command linesJiri Malak2020-04-281-20/+22
| | | | | | | |
| * | | | | | | OpenWatcom: Move non-Windows settings to Modules/CompilerJiri Malak2020-04-284-109/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restructure OpenWatcom toolchain support files to simplify adding of new targets DOS, OS/2 and Linux including cross-compilation.
* | | | | | | | Merge topic 'FindPython-find-implementations'Brad King2020-04-299-491/+695
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2c47c822b FindPython: Add capability to specify Python implementations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4676
| * | | | | | | | FindPython: Add capability to specify Python implementationsMarc Chevrier2020-04-289-491/+695
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Through hint Python_FIND_IMPLEMENTATIONS it is possble to specify, as an ordered list, which implementations must be searched for. Currently possible values are: * CPython * IronPython
* | | | | | | | CMake Nightly Date StampKitware Robot2020-04-291-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.17'Brad King2020-04-280-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | CMake 3.17.2v3.17.2Brad King2020-04-281-1/+1
| | | | | | |
* | | | | | | Merge topic 'FindLAPACK-target'Brad King2020-04-286-0/+73
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ed936d1b8 FindLAPACK: Provide the LAPACK::LAPACK import target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4677
| * | | | | | | FindLAPACK: Provide the LAPACK::LAPACK import targetRobert Maynard2020-04-276-0/+73
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'stdstring-fformat'Brad King2020-04-285-18/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fd28b9911 cmOutputConverter::GetFortranFormat(): delete const char* overload Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4671
| * | | | | | | cmOutputConverter::GetFortranFormat(): delete const char* overloadVitaly Stakhovsky2020-04-275-18/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'cmake-gui-empty-compiler'Brad King2020-04-281-4/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a0c17f704 cmake-gui: Do not pass CMAKE_{C,CXX}_COMPILER items to cmake if empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4664
| * | | | | | | cmake-gui: Do not pass CMAKE_{C,CXX}_COMPILER items to cmake if emptyJiri Malak2020-04-271-4/+8
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If C or C++ compiler is not specified in the initial dialog, do not pass `CMAKE_C_COMPILER` or `CMAKE_CXX_COMPILER` cache entries for cross-compilation setup. Instead allow the normal search for the compiler to proceed.
* | | | | | | Merge topic 'wmake-null'Brad King2020-04-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 511a03f933 Watcom WMake: Use wmake internal %null command for empty command list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4670
| * | | | | | | Watcom WMake: Use wmake internal %null command for empty command listJiri Malak2020-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wmake internal command %null realy do "nothing". It is designed to use in command lists.
* | | | | | | | Merge branch 'release-3.17'Brad King2020-04-280-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'FindBoost-1.73' into release-3.17Brad King2020-04-281-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69ed51960b FindBoost: Prevent warning with boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4662
* | \ \ \ \ \ \ \ Merge topic 'FindBoost-1.73'Brad King2020-04-281-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69ed51960b FindBoost: Prevent warning with boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4662
| * | | | | | | | FindBoost: Prevent warning with boost 1.73Orgad Shaneh2020-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9daf79c53b (FindBoost: Add support for Boost 1.73, 2020-04-19) we forgot to update the version comparison for the warning.
* | | | | | | | | Merge branch 'release-3.16'Brad King2020-04-280-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'makefile-objc' into release-3.16Brad King2020-04-282-3/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4675
| * \ \ \ \ \ \ \ \ \ Merge branch 'pch-genex-absolute' into release-3.16Brad King2020-04-275-16/+19
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4678
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-04-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge topic 'makefile-objc' into release-3.17Brad King2020-04-282-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4d09fdc6d Makefiles: Add Objective C/C++ compilations to compile_commands.json 98aa628f0b Makefiles: Scan Objective C/C++ preprocessor dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4675