summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute pathLucas Wang2020-03-271-1/+1
| | | | | `CMAKE_RC_COMPILER_INIT` and `CMAKE_RC_COMPILER` can be set by user, for example `llvm-rc-10` and `D:\LLVM\bin\llvm-rc.exe`.
* Merge topic 'llvm-rc-stderr' into release-3.17Brad King2020-03-274-3/+13
|\ | | | | | | | | | | | | dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4525
| * llvm-rc: Print stderr output when calling tools through cmake_llvm_rcThomas Bernard2020-03-264-3/+13
| | | | | | | | | | | | The stored error pipe is output if the program fails. Fixes: #20494
* | Merge topic 'llvm-rc-depfile' into release-3.17Brad King2020-03-271-3/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 2c724c3aea llvm-rc: Write depfile to location specified by the generator 4cc876540e llvm-rc: Select preprocessor from active languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4524
| * | llvm-rc: Write depfile to location specified by the generatorThomas Bernard2020-03-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move the depfile flags to `CMAKE_DEPFILE_FLAGS_RC` so that they are only usedwith generators that use depfiles. Also switch to using the `<DEPFILE>` placeholder for the location of the depfile so that it goes where the generator expects. Fixes: #20493
| * | llvm-rc: Select preprocessor from active languagesThomas Bernard2020-03-261-2/+2
| |/ | | | | | | | | | | The llvm-rc preprocessor is selected according to the CMAKE_C_COMPILER_ID / CMAKE_CXX_COMPILER_ID which are only defined when the C or CXX language is active.
* | Merge topic 'make-nested-silent' into release-3.17Brad King2020-03-271-1/+5
|\ \ | | | | | | | | | | | | | | | | | | d6d9da5178 Makefiles: Fix silencing of nested calls for GNU make 4.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4515
| * | Makefiles: Fix silencing of nested calls for GNU make 4.3Brad King2020-03-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Since GNU make 4.3, `.SILENT:` no longer causes nested `$(MAKE)` calls to get `-s` implicitly. Add the `-s` flag explicitly on such calls to suppress messages about Entering/Leaving directories. Fixes: #20487
* | | Merge topic 'FindPython-polish' into release-3.17Brad King2020-03-254-27/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bf1ecfef7f FindPython: misc. fixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4519
| * | | FindPython: misc. fixesMarc Chevrier2020-03-244-27/+21
|/ / / | | | | | | | | | | | | Help: Fix errors regardings HINTS. Code: Optimize Python signature cache variable to avoid unecessary searchs.
* | | Merge topic 'doc-typo' into release-3.17Brad King2020-03-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 356c7cec2c Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4516
| * | | Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rstJaak Ristioja2020-03-231-1/+1
| | |/ | |/| | | | | | | Signed-off-by: Jaak Ristioja <jaak@ristioja.ee>
* | | Merge topic 'cmake-gui-open-check' into release-3.17Brad King2020-03-231-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | ecc0086bfc cmake-gui: Fix use-after-free in Open-possible check Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4508
| * | cmake-gui: Fix use-after-free in Open-possible checkFrancisco Facioni2020-03-201-1/+1
|/ / | | | | | | | | Fix `QCMake::checkOpenPossible` to copy `toLocal8Bit().data()` before its lifetime expires.
* | CMake 3.17.0v3.17.0Brad King2020-03-201-1/+1
| |
* | Merge topic 'FindMatlab-r2020' into release-3.17Brad King2020-03-201-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 75331a4578 FindMatlab: Add R2020a=9.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4507
| * | FindMatlab: Add R2020a=9.8Michael Hirsch, Ph.D2020-03-191-0/+1
| | | | | | | | | | | | This allows Matlab R2020a to be recognized as a valid Matlab version.
* | | Merge topic 'GetPrerequisites-vcruntime-is-system' into release-3.17Brad King2020-03-201-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 417b765f5a GetPrerequisites: Classify vcruntime libraries as system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4506
| * | | GetPrerequisites: Classify vcruntime libraries as systemErr0rC0deX2020-03-191-3/+3
| | |/ | |/| | | | | | | | | | Previously GetPrerequisites classified `vcruntime*.dll` as type "other". They should be classified as type "system".
* | | Merge topic 'export-repeat' into release-3.17Brad King2020-03-208-28/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8affe9aa33 export: Fix use-after-free on multiple calls overwriting same FILE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4494
| * | | export: Fix use-after-free on multiple calls overwriting same FILEBrad King2020-03-198-28/+41
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake 3.16 and below allow multiple `export()` calls with the same output file even without using `APPEND`. The implementation worked by accident by leaking memory. Refactoring in commit 5444a8095d (cmGlobalGenerator: modernize memrory managemenbt, 2019-12-29, v3.17.0-rc1~239^2) cleaned up that memory leak and converted it to a use-after-free instead. The problem is caused by using the `cmGlobalGenerator::BuildExportSets` map to own `cmExportBuildFileGenerator` instances. It can own only one instance per output FILE name at a time, so repeating use of the same file now frees the old `cmExportBuildFileGenerator` instance and leaves the pointer in the `cmMakefile::ExportBuildFileGenerators` vector dangling. Move ownership of the instances into `cmMakefile`'s vector since its entries are not replaced on a repeat output FILE. In future work we should introduce a policy to error out on this case. For now simply fix the use-after-free to restore CMake <= 3.16 behavior. Fixes: #20469
* | | Merge topic 'trace-format-json-doc' into release-3.17Brad King2020-03-192-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1994f950ff cmake: List valid values for --trace-format on the command line e39766d84a Help: Fix documentation of --trace-format parameter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4500
| * | | cmake: List valid values for --trace-format on the command lineKyle Edwards2020-03-181-1/+2
| | | |
| * | | Help: Fix documentation of --trace-format parameterKyle Edwards2020-03-181-1/+1
|/ / /
* | | Merge topic 'FindPython-version-validation-fix' into release-3.17Brad King2020-03-183-19/+71
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cc7f116cb4 FindPython: fix regression on version validation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4492
| * | | FindPython: fix regression on version validationMarc Chevrier2020-03-173-19/+71
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 3dab4682f6 (FindPython: reduces consumption of resources, 2020-02-10, v3.17.0-rc1~11^2) we accidentally broke the python executable version validation when the "LOCATION" strategy is used with the plain `FindPython` module. Fix the logic and add test cases covering those combinations. Fixes: #20465
* | | Merge topic 'FindThreads-doc' into release-3.17Brad King2020-03-171-16/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1502f281dd FindThreads: Improve documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4480
| * | | FindThreads: Improve documentationRolf Eike Beer2020-03-161-16/+29
| |/ / | | | | | | | | | Issue: #19823
* | | Merge topic 'generated-byproducts-docs' into release-3.17Brad King2020-03-124-11/+30
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 3eb2b62d21 Help: Expand discussion of GENERATED / BYPRODUCTS 1853c7f571 Help: Add missing word in AUTOGEN_TARGET_DEPENDS.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4472
| * | Help: Expand discussion of GENERATED / BYPRODUCTSFeRD (Frank Dana)2020-03-123-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | - Mention the Makefile Generators' `make clean` removal in the BYPRODUCTS section of add_custom_command and add_custom_target - Expand the GENERATED property docs' description of which files will be marked with the property, and of what it implies (including `make clean` removal)
| * | Help: Add missing word in AUTOGEN_TARGET_DEPENDS.rstFeRD (Frank Dana)2020-03-121-1/+1
|/ /
* | CMake 3.17.0-rc3v3.17.0-rc3Brad King2020-03-121-1/+1
| |
* | Merge topic 'apple-clang-flags-c++17' into release-3.17Brad King2020-03-122-2/+8
|\ \ | | | | | | | | | | | | | | | | | | a67f2d00d8 Apple Clang: add flags for C++17 standard Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4468
| * | Apple Clang: add flags for C++17 standardMarc Chevrier2020-03-122-2/+8
| | |
* | | Merge topic 'swift-link-line-spaces' into release-3.17Brad King2020-03-121-3/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | af39d1b993 Swift: Fix quoting of library search paths with spaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4469
| * | | Swift: Fix quoting of library search paths with spacesSaleem Abdulrasool2020-03-121-3/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | The library search paths added by commit 2746c61e6d (Swift: Add library search paths for dependencies, 2019-06-09, v3.16.0-rc1~561^2) need to be quoted properly on command lines to handle spaces and such. This was already done by `cmLinkLineComputer::ComputeLinkPath` for non-Swift-specific link directories.
* | | Merge topic 'ctest-curl-debugfunction' into release-3.17Brad King2020-03-122-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4459
| * | | CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docsBetsy McPhail2020-03-112-2/+2
| | |/ | |/| | | | | | | | | | | | | The curl debug callback function must return ``0``. Fixes: #20449
* | | Merge topic 'FindPython-ENV-CMAKE_FRAMEWORK_PATH' into release-3.17Brad King2020-03-121-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !4462
| * | | FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake pathBo Anderson2020-03-111-1/+2
| |/ /
* | | Merge topic 'swift-rpath' into release-3.17Brad King2020-03-121-4/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f481b3a947 Swift: repair RPATH handling for macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4456
| * | | Swift: repair RPATH handling for macOSSaleem Abdulrasool2020-03-111-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configuration previously handled Linux properly but did not function on macOS as `ld64` does not support `:` delimited paths. Account for that by setting it to the empty string which will use multiple invocations of the `-Xlinker -rpath -Xlinker ...` pattern to compute the correct RPATH.
* | | | Merge topic 'rename-macho-version-properties' into release-3.17Craig Scott2020-03-1211-44/+44
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4452
| * | | macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSIONBrad King2020-03-1211-44/+44
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The properties added by commit 4a62e3d97c (macOS: Add OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties, 2020-01-24, v3.17.0-rc1~80^2~1) are general-purpose for all platforms using Mach-O formats and not just on OS X. Rename them accordingly. The properties are new to the CMake 3.17 release so we can rename them without compatibility concerns. Fixes: #20442
* | | Merge topic 'FindCUDAToolkit-reduce-verbosity' into release-3.17Brad King2020-03-111-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a7cf574417 CUDAToolkit: Mark find queries as advanced variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4455
| * | | CUDAToolkit: Mark find queries as advanced variablesRobert Maynard2020-03-101-1/+8
| |/ / | | | | | | | | | Fixes #20435
* | | Merge topic 'release-notes-minor-cleanups' into release-3.17Brad King2020-03-101-13/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d5e6fedd7b Help: Cleanup minor typos and grammar in 3.17 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4449
| * | | Help: Cleanup minor typos and grammar in 3.17 release notesCraig Scott2020-03-101-13/+13
| | | |
* | | | Merge topic 'doc-3.17-relnotes' into release-3.17Brad King2020-03-103-6/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b925d0536 Help: Fix 3.17 release notes for Xcode scheme settings e0409b8bca Help: Fix toctree order of Xcode scheme variable and property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4447
| * | | | Help: Fix 3.17 release notes for Xcode scheme settingsBrad King2020-03-101-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 730a53ef1d (Help: Organize and revise 3.17 release notes, 2020-02-04, v3.17.0-rc1~21^2) we accidentally combined the release notes for `CMAKE_XCODE_SCHEME_ENVIRONMENT` and `XCODE_SCHEME_WORKING_DIRECTORY`. Split them up again. Also mention `CMAKE_XCODE_SCHEME_WORKING_DIRECTORY`. Fixes: #20439