summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'custom-command-work-dir-genex'Brad King2018-11-054-15/+8
|\ | | | | | | | | | | | | 98d59417b0 add_custom_{command,target}: Fix WORKING_DIRECTORY leading genex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2559
| * add_custom_{command,target}: Fix WORKING_DIRECTORY leading genexBrad King2018-11-034-15/+8
| | | | | | | | | | | | | | | | | | | | | | Since commit v3.13.0-rc1~39^2 (add_custom_{command,target}: WORKING_DIRECTORY generator expressions, 2018-09-22) the `WORKING_DIRECTORY` option accepts generator expressions. Fix support for the case of a leading generator expression by deferring conversion to an absolute path until after evaluation of the generator expression. Fixes: #18543
* | CMake Nightly Date StampKitware Robot2018-11-051-1/+1
| |
* | Merge branch 'release-3.13'Craig Scott2018-11-050-0/+0
|\ \
| * \ Merge branch 'cpack-gen-docs-link' into release-3.13Craig Scott2018-11-051-2/+3
| |\ \ | | | | | | | | | | | | Merge-request: !2562
* | \ \ Merge topic 'cpack-gen-docs-link'Craig Scott2018-11-051-2/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | c12eefa8fd Help: Fix generators link in cpack(1) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2562
| * | | Help: Fix generators link in cpack(1) manualCraig Scott2018-11-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor rewording around the updated link and extra blank line added to improve readability and remove a potential ambiguity around the same area. Fixes: #18545
* | | | CMake Nightly Date StampKitware Robot2018-11-041-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-11-031-1/+1
| | | |
* | | | Merge branch 'release-3.12'Brad King2018-11-020-0/+0
|\ \ \ \
| * | | | CMake 3.12.4v3.12.4Brad King2018-11-021-1/+1
| | | | |
* | | | | Merge topic 'FindGDAL-target'Brad King2018-11-026-11/+91
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22ba9b6a32 FindGDAL: set the GDAL_VERSION 525ff0c3bc Tests/FindGDAL: add a test for FindGDAL 87324b9b6a FindGDAL: add an imported target dfb3f58f79 FindGDAL: Modernize documentation layout Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2552
| * | | | | FindGDAL: set the GDAL_VERSIONBen Boeckel2018-11-013-7/+17
| | | | | |
| * | | | | Tests/FindGDAL: add a test for FindGDALBen Boeckel2018-11-014-0/+44
| | | | | |
| * | | | | FindGDAL: add an imported targetBen Boeckel2018-11-012-0/+17
| | | | | |
| * | | | | FindGDAL: Modernize documentation layoutBrad King2018-11-011-12/+21
| | | | | |
* | | | | | Merge topic 'msvc-custom-rc-mt'Brad King2018-11-0210-25/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd9bfc6449 MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe} 0033676796 CUDA: Enable RC language on Windows 02f566a559 MSVC: Factor out enable_language(RC) call into helper macro b601bb6f1c CUDA: Find CMAKE_LINKER on Windows 3eebe28ef4 cmLocalNinjaGenerator: Simplify CreateRulePlaceholderExpander Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2424
| * | | | | | MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe}Mateusz Zych2018-10-299-22/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake commands vs_link_dll and vs_link_exe, performing linking on MSVC, are responsible for calling resource compiler and manifest tool. Before this commit, both of these tools were called directly, with the expectation that they are available in the `PATH`. This has been fixed by respecting CMake variables `CMAKE_RC_COMPILER` and `CMAKE_MT` defining paths to these tools. Fixes: #17804
| * | | | | | CUDA: Enable RC language on WindowsBrad King2018-10-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need the resource compiler to place manifests in binaries. Make sure it is available.
| * | | | | | MSVC: Factor out enable_language(RC) call into helper macroBrad King2018-10-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be useful to call from elsewhere later.
| * | | | | | CUDA: Find CMAKE_LINKER on WindowsBrad King2018-10-292-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use this in `Modules/Platform/Windows-NVIDIA-CUDA.cmake`, so make sure it is available.
| * | | | | | cmLocalNinjaGenerator: Simplify CreateRulePlaceholderExpanderMateusz Zych2018-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-use the derived class implementation instead of duplicating it.
* | | | | | | Merge topic 'check-keywords-only-if-used'Brad King2018-11-0223-10/+103
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4babc9058a cmTargetPropCommandBase: check keywords after parsing 45a49ae58a cmTargetPropCommandBase: simplify code path 9f64974f5e cmTargetPropCommandBase: skip property setting if there's nothing to add 4201a11c2b Tests: add tests for empty-value keyword arguments in target_* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2514
| * | | | | | | cmTargetPropCommandBase: check keywords after parsingBen Boeckel2018-10-2615-49/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following was disallowed: add_library(iface INTERFACE) target_link_libraries(iface PUBLIC) just due to the mention of the `PUBLIC` keyword. Instead, only error if there are actually `PUBLIC` dependencies specified (and analogously for other restrictions). Update tests to expect this new behavior.
| * | | | | | | cmTargetPropCommandBase: simplify code pathBen Boeckel2018-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The outside of the loop does the same return expression.
| * | | | | | | cmTargetPropCommandBase: skip property setting if there's nothing to addBen Boeckel2018-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some target types don't allow setting certain properties even if there is no value being set there. Guard against this by avoiding property setting when there is nothing to add.
| * | | | | | | Tests: add tests for empty-value keyword arguments in target_*Ben Boeckel2018-10-2636-0/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all of these commands accept non-compilable (i.e., IMPORTED) targets, so those calls are currently just commented out. If they ever do start to accept them, the tests should be enabled.
* | | | | | | | Merge topic 'FindBoost-exact-version'Brad King2018-11-021-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9855a80fd4 FindBoost: search default path if Boost_FIND_VERSION_EXACT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2543
| * | | | | | | | FindBoost: search default path if Boost_FIND_VERSION_EXACTHannes Franke2018-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search paths for boost versions should be build using _boost_TEST_VERSIONS instead of _Boost_KNOWN_VERSIONS because if Boost_FIND_VERSION_EXACT is used _Boost_KNOWN_VERSIONS is empty and boost isn't found even in its default installation path. Fixes: #17986
* | | | | | | | | Merge branch 'release-3.13'Brad King2018-11-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'server-file-monitor-check' into release-3.13Brad King2018-11-011-1/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2556
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.12'Brad King2018-11-020-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'server-file-monitor-check' into release-3.12Brad King2018-11-011-1/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | Merge-request: !2556
* | | | | | | | | | Merge topic 'server-file-monitor-check'Brad King2018-11-021-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb52529ff4 server: Fix assertion failure on directory paths in file monitor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2556
| * | | | | | | | | server: Fix assertion failure on directory paths in file monitorVladimir Penev2018-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18532
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-11-021-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.13'Brad King2018-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'FindProtobuf-threads' into release-3.13Brad King2018-10-311-14/+22
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2551
| * \ \ \ \ \ \ \ \ \ Merge branch 'fix-custom-target-with-csharp' into release-3.13Brad King2018-10-319-31/+40
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2549
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.12'Brad King2018-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'backport-fix-custom-target-with-csharp' into release-3.12Brad King2018-10-318-29/+38
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2549
* | \ \ \ \ \ \ \ \ \ \ \ Merge topic 'FindProtobuf-threads'Brad King2018-11-011-14/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03454b0d0d FindProtobuf: Add missing link dependencies on threads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2551
| * | | | | | | | | | | | FindProtobuf: Add missing link dependencies on threadsBrad King2018-10-311-14/+22
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protobuf headers have dependencies on threads. On UNIX platforms this requires linking to a threads library. We've long done this in the `Protobuf_LIBRARIES` result variable. However, the imported targets added by commit v3.9.0-rc1~81^2~2 (FindProtobuf: add targets, 2017-05-17) and commit v3.9.0-rc1~68^2 (FindProtobuf: Rename imported targets to match upstream names, 2017-05-22) were missing a dependency on threads. Add the dependency to the imported targets, and to the variables `Protobuf_LITE_LIBRARIES` and `Protobuf_PROTOC_LIBRARIES`. While this did not seem to matter in practice for a long time, protobuf 3.6 throws exceptions in some cases when threads are missing. Fixes: #18533
* | | | | | | | | | | | Merge topic 'fix-custom-target-with-csharp'Brad King2018-11-019-31/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9040df31e2 Merge branch 'backport-fix-custom-target-with-csharp' 1acd1c2b50 CSharp: Fix regression in VS project type selection for custom target a56edad6d6 CSharp: Fix regression in VS project type selection for custom target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2549
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-fix-custom-target-with-csharp'Brad King2018-10-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | CSharp: Fix regression in VS project type selection for custom targetBrad King2018-10-318-29/+38
| | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A target created by `add_custom_target` should always be a `.vcxproj` file even if it has `.cs` sources involved in custom commands and such. The latter case was broken by refactoring in commit v3.12.0-rc1~160^2~7 (remove TargetIsCSharpOnly() and use methods from cmGeneratorTarget, 2018-03-19). The reason is that the `HasLanguage` method added by commit v3.12.0-rc1~239^2~6 (cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages(), 2018-03-19) does not check the target type and so is not a suitable check for deciding the project file extension. The `HasLanguage` method was an attempt at an abstraction that turns out not to work very well. Replace it with a dedicated `IsCSharpOnly` method that considers the target type, sources, and non-transitive `LINKER_LANGUAGE`. Fixes: #18515
| * | | | | | | | | | CSharp: Fix regression in VS project type selection for custom targetBrad King2018-10-319-31/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A target created by `add_custom_target` should always be a `.vcxproj` file even if it has `.cs` sources involved in custom commands and such. The latter case was broken by refactoring in commit v3.12.0-rc1~160^2~7 (remove TargetIsCSharpOnly() and use methods from cmGeneratorTarget, 2018-03-19). The reason is that the `HasLanguage` method added by commit v3.12.0-rc1~239^2~6 (cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages(), 2018-03-19) does not check the target type and so is not a suitable check for deciding the project file extension. The `HasLanguage` method was an attempt at an abstraction that turns out not to work very well. Replace it with a dedicated `IsCSharpOnly` method that considers the target type, sources, and non-transitive `LINKER_LANGUAGE`. Fixes: #18515
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-11-011-1/+1
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.13'Brad King2018-10-310-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'FindPostgreSQL-11' into release-3.13Brad King2018-10-311-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2547