Commit Graph

41156 Commits

Author SHA1 Message Date
Kitware Robot 112100da90 CMake Nightly Date Stamp 2018-11-04 00:01:06 -04:00
Kitware Robot 443c574a7c CMake Nightly Date Stamp 2018-11-03 00:01:09 -04:00
Brad King 0730fb5c44 Merge branch 'release-3.12' 2018-11-02 09:25:14 -04:00
Brad King 3a77329c40 CMake 3.12.4 v3.12.4 2018-11-02 08:05:07 -04:00
Brad King bdc5618e18 Merge topic 'FindGDAL-target'
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
2018-11-02 07:57:54 -04:00
Brad King a052479a5c Merge topic 'msvc-custom-rc-mt'
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
2018-11-02 07:57:06 -04:00
Brad King 9578c3f0d1 Merge topic 'check-keywords-only-if-used'
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
2018-11-02 07:55:14 -04:00
Brad King 08da4f8d70 Merge topic 'FindBoost-exact-version'
9855a80fd4 FindBoost: search default path if Boost_FIND_VERSION_EXACT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2543
2018-11-02 07:53:22 -04:00
Brad King bacb20a336 Merge branch 'release-3.13' 2018-11-02 07:49:13 -04:00
Brad King 34e011748e Merge branch 'release-3.12' 2018-11-02 07:48:59 -04:00
Brad King c384fc3ca4 Merge topic 'server-file-monitor-check'
eb52529ff4 server: Fix assertion failure on directory paths in file monitor

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2556
2018-11-02 07:48:34 -04:00
Kitware Robot fa5e5550f3 CMake Nightly Date Stamp 2018-11-02 00:01:13 -04:00
Ben Boeckel 22ba9b6a32 FindGDAL: set the GDAL_VERSION 2018-11-01 13:16:37 -04:00
Ben Boeckel 525ff0c3bc Tests/FindGDAL: add a test for FindGDAL 2018-11-01 13:16:37 -04:00
Ben Boeckel 87324b9b6a FindGDAL: add an imported target 2018-11-01 13:16:36 -04:00
Brad King dfb3f58f79 FindGDAL: Modernize documentation layout 2018-11-01 13:16:36 -04:00
Brad King a567f533db Merge branch 'server-file-monitor-check' into release-3.13
Merge-request: !2556
2018-11-01 09:02:41 -04:00
Brad King 4ccf278f5b Merge branch 'server-file-monitor-check' into release-3.12
Merge-request: !2556
2018-11-01 09:02:30 -04:00
Brad King 707ac6aab6 Merge branch 'release-3.13' 2018-11-01 07:38:54 -04:00
Brad King ce45effe13 Merge branch 'release-3.12' 2018-11-01 07:38:08 -04:00
Brad King 133465a0e5 Merge topic 'FindProtobuf-threads'
03454b0d0d FindProtobuf: Add missing link dependencies on threads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2551
2018-11-01 07:37:30 -04:00
Brad King d955b4f753 Merge topic 'fix-custom-target-with-csharp'
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
2018-11-01 07:36:39 -04:00
Vladimir Penev eb52529ff4 server: Fix assertion failure on directory paths in file monitor
Fixes: #18532
2018-11-01 07:25:17 -04:00
Kitware Robot 75b85133d8 CMake Nightly Date Stamp 2018-11-01 00:01:09 -04:00
Brad King 8f043068d5 Merge branch 'FindProtobuf-threads' into release-3.13
Merge-request: !2551
2018-10-31 10:29:14 -04:00
Brad King 03454b0d0d FindProtobuf: Add missing link dependencies on threads
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
2018-10-31 10:24:01 -04:00
Brad King 9040df31e2 Merge branch 'backport-fix-custom-target-with-csharp' 2018-10-31 09:38:01 -04:00
Brad King 3065a8a793 Merge branch 'fix-custom-target-with-csharp' into release-3.13
Merge-request: !2549
2018-10-31 09:36:38 -04:00
Brad King 609bdd126d Merge branch 'backport-fix-custom-target-with-csharp' into release-3.12
Merge-request: !2549
2018-10-31 09:35:19 -04:00
Brad King 7f68e4a163 Merge branch 'release-3.13' 2018-10-31 09:34:33 -04:00
Brad King 09e36f9978 Merge branch 'FindPostgreSQL-11' into release-3.13
Merge-request: !2547
2018-10-31 09:33:56 -04:00
Brad King caaa51b9a1 Merge topic 'FindBoost-debug-lib-prefix'
c664470966 FindBoost: Output Boost_LIB_PREFIX if Boost_DEBUG=ON requested

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Roger Leigh <rleigh@codelibre.net>
Merge-request: !2548
2018-10-31 09:33:08 -04:00
Brad King 5dc4bd1c90 Merge topic 'FindPostgreSQL-11'
eea851bc2e FindPostgreSQL: Search for version 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mateusz Łoskot <mateusz@loskot.net>
Merge-request: !2547
2018-10-31 09:32:38 -04:00
Brad King 1acd1c2b50 CSharp: Fix regression in VS project type selection for custom target
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
2018-10-31 09:20:15 -04:00
Brad King a56edad6d6 CSharp: Fix regression in VS project type selection for custom target
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
2018-10-31 09:13:19 -04:00
Kitware Robot 69aaf0d076 CMake Nightly Date Stamp 2018-10-31 00:01:12 -04:00
Brad King a79e5e1943 Merge branch 'release-3.13' 2018-10-30 11:06:17 -04:00
Brad King ef9c59c37e Merge branch 'release-3.12' 2018-10-30 11:05:57 -04:00
Brad King 1d4b1a5853 Merge topic 'cuda_device_linking_drop_dynamic_libs'
e8cc8d22d8 Merge branch 'backport-cuda-filter-device-link-libs'
3f5bfb425a CUDA: Filter out non-static libraries during device linking
3c31ec7a0a CUDA: Filter out non-static libraries during device linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Merge-request: !2536
2018-10-30 11:03:03 -04:00
Brad King 87dfd53b27 Merge topic 'set_directory_properties-script-mode'
50572d638b set_directory_properties: Restore in script mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2544
2018-10-30 11:01:36 -04:00
Brad King 157e3e1bd6 Merge topic 'flang-preprocess-source'
8d782adbce Flang: Fix command-line used to preprocess sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2545
2018-10-30 11:00:41 -04:00
Brad King a298c18812 Merge topic 'FindBoost-stacktrace'
b27cf72dea FindBoost: Add support for stacktrace components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Roger Leigh <rleigh@codelibre.net>
Merge-request: !2541
2018-10-30 11:00:00 -04:00
Brad King 59d57f023f Merge topic 'qccDepfile'
99728fe27c QNX: Update qcc depfile flags to be compliant with ccache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2540
2018-10-30 10:59:12 -04:00
Brad King 4c669a0a34 Merge topic 'UseSWIG-typos'
2fc43415ef UseSWIG: Add target language and input file in command description
20fd16e756 UseSWIG: Typo, add missing letter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2542
2018-10-30 10:57:45 -04:00
Brad King 263afbad64 Merge topic 'UseSWIG-multi-input'
bb57cb80eb UseSWIG: multiple input files must be supported in version 2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2539
2018-10-30 10:56:55 -04:00
Brad King b8f5eca5e2 Merge topic 'FindMatlab-2018a-API'
42731e94be FindMatlab: Fix linker command under Windows.
ee73e733e4 FindMatlab: Fix compilation error in one specific test configuration.
160499296c FindMatlab: added unit tests for new functionality.
ee7e97a7d3 FindMatlab: add change log item.
d7e19032d5 FindMatlab: `matlab_add_mex` has new options `R2017b` and `R2018a`.
518553d953 FindMatlab: Always find core libraries.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2508
2018-10-30 10:55:52 -04:00
Mateusz Łoskot c664470966 FindBoost: Output Boost_LIB_PREFIX if Boost_DEBUG=ON requested
Output Boost_NAMESPACE too.
2018-10-30 11:07:48 +01:00
Sylvain Joubert eea851bc2e FindPostgreSQL: Search for version 11 2018-10-30 10:04:09 +01:00
Kitware Robot 9330afea04 CMake Nightly Date Stamp 2018-10-30 00:01:08 -04:00
Brad King 76d826fffb Merge branch 'UseSWIG-typos' into release-3.13
Merge-request: !2542
2018-10-29 16:17:58 -04:00