Commit Graph

41177 Commits

Author SHA1 Message Date
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
Brad King 67b19119da Merge branch 'FindBoost-stacktrace' into release-3.13
Merge-request: !2541
2018-10-29 16:11:02 -04:00
Martin Quinson b27cf72dea FindBoost: Add support for stacktrace components
Define the headers associated to `boost_stacktrace_*`.

Fixes: #17297
2018-10-29 16:09:56 -04:00
Brad King b8e2c42f36 Merge branch 'flang-preprocess-source' into release-3.13
Merge-request: !2545
2018-10-29 14:26:01 -04:00
Brad King 8d782adbce Flang: Fix command-line used to preprocess sources
Running flang with `-E` now ignores any `-o` option and always prints
preprocessed output to stdout.  Use shell redirection to place it in a
file instead.

Fixes: #18497
2018-10-29 14:23:58 -04:00
Mateusz Zych bd9bfc6449 MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe}
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
2018-10-29 13:40:47 -04:00
Brad King 0033676796 CUDA: Enable RC language on Windows
We need the resource compiler to place manifests in binaries.
Make sure it is available.
2018-10-29 13:40:47 -04:00
Brad King 02f566a559 MSVC: Factor out enable_language(RC) call into helper macro
This will be useful to call from elsewhere later.
2018-10-29 13:40:47 -04:00
Brad King b601bb6f1c CUDA: Find CMAKE_LINKER on Windows
We use this in `Modules/Platform/Windows-NVIDIA-CUDA.cmake`, so make
sure it is available.
2018-10-29 13:40:47 -04:00
Brad King 37cf805d3e Merge branch 'qccDepfile' into release-3.13
Merge-request: !2540
2018-10-29 12:51:19 -04:00
Maikel van den Hurk 99728fe27c QNX: Update qcc depfile flags to be compliant with ccache
Pass the flags to the preprocessor phase via `-Wp,`.  This is
accepted both by qcc and ccache.
2018-10-29 12:50:55 -04:00
Sylvain Joubert 2fc43415ef UseSWIG: Add target language and input file in command description 2018-10-29 17:09:48 +01:00
Brad King f366228c80 Merge branch 'cuda-filter-device-link-libs' into release-3.13
Merge-request: !2536
2018-10-29 12:02:46 -04:00
Brad King 88477e0429 Merge branch 'backport-cuda-filter-device-link-libs' into release-3.12
Merge-request: !2536
2018-10-29 12:02:18 -04:00
Brad King e8cc8d22d8 Merge branch 'backport-cuda-filter-device-link-libs' 2018-10-29 12:00:40 -04:00
Robert Maynard 3f5bfb425a CUDA: Filter out non-static libraries during device linking
Since commit v3.12.0-rc1~278^2 (CUDA: Pass more link libraries to device
linking, 2018-03-27) we consider every link library during device
linking and use `-Xnvlink` to pass those that do not end in `.a`.
However, nvlink breaks on versioned shared library names such as
`.so.1`.  Work around this problem by not passing library paths that do
not end in `.a` or `.lib`.  nvlink would not find device symbols in them
anyway.

Fixes: #18504
2018-10-29 11:59:54 -04:00
Robert Maynard 3c31ec7a0a CUDA: Filter out non-static libraries during device linking
Since commit v3.12.0-rc1~278^2 (CUDA: Pass more link libraries to device
linking, 2018-03-27) we consider every link library during device
linking and use `-Xnvlink` to pass those that do not end in `.a`.
However, nvlink breaks on versioned shared library names such as
`.so.1`.  Work around this problem by not passing library paths that do
not end in `.a` or `.lib`.  nvlink would not find device symbols in them
anyway.

Fixes: #18504
2018-10-29 11:57:29 -04:00
Brad King 87d38b4038 Merge branch 'UseSWIG-multi-input' into release-3.13
Merge-request: !2539
2018-10-29 11:47:26 -04:00
Brad King 44cef5fd92 Merge branch 'set_directory_properties-script-mode' into release-3.13
Merge-request: !2544
2018-10-29 11:45:49 -04:00
Brad King 9b5ebbd860 Merge branch 'set_directory_properties-script-mode' into release-3.12
Merge-request: !2544
2018-10-29 11:45:36 -04:00
Hannes Franke 9855a80fd4 FindBoost: search default path if Boost_FIND_VERSION_EXACT
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
2018-10-29 16:44:40 +01:00
Marc Chevrier bb57cb80eb UseSWIG: multiple input files must be supported in version 2
Fixes: #18506
2018-10-29 16:39:03 +01:00
Brad King 50572d638b set_directory_properties: Restore in script mode
Since commit v3.10.0-rc1~391^2~3 (Add directory property 'LABELS' and
CMAKE_DIRECTORY_LABELS variable, 2017-06-23) this command was
accidentally not allowed in script mode.  It was dropped because
`ctest -S` mode needs to start with CMake's normal script mode and
then replace the `set_directory_properties` implementation.  Restore
the normal `set_directory_properties` in script mode and then add
special logic to replace it in ctest.  Also add a test case.

Fixes: #18523
2018-10-29 11:37:32 -04:00
Sylvain Joubert 20fd16e756 UseSWIG: Typo, add missing letter 2018-10-29 15:00:11 +01:00
Brad King d697f4eb48 Merge topic 'target_property-clarification'
213433858f Help: Clarify usage of TARGET_PROPERTY generator expression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2535
2018-10-29 09:58:00 -04:00
Brad King d6b7c037b2 Merge topic 'ExternalProject-log-patch'
a4e9391953 ExternalProject: add LOG_PATCH option to log the patch command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2534
2018-10-29 09:57:17 -04:00
Brad King bcd61da350 Merge topic 'graphviz-fix-alias'
50c4dec072 graphviz: dereference ALIAS targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2521
2018-10-29 09:56:25 -04:00
Brad King f0a9094d80 Merge topic 'no-smiley'
24fa04018c Help: Spell out ";-list" as "semicolon-separated list"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2528
2018-10-29 09:30:25 -04:00
Brad King 4eb77958d2 Merge topic 'minusCparse'
379e5f93a9 Tests: Add cases for -{C,D,U} without a source tree
5873815fef cmake: distinguish '-Cpath' from '-C path' in source dir parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2517
2018-10-29 09:29:34 -04:00
Brad King 0f84db3af4 Merge topic 'appdef-stdstring'
b2c85cb698 cmLocalGenerator::AppendDefines: Remove const char* overloads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2533
2018-10-29 09:27:23 -04:00