Commit Graph

40894 Commits

Author SHA1 Message Date
Felix Geyer bd831ed094 FindBoost: Add system thread library to Boost_LIBRARIES
Add the system thread library to Boost_LIBRARIES when the boost thread
component has been found.

The Boost::thread imported target already pulls in Threads::Threads.
This changes does the same for projects using the Boost_LIBRARIES variable
instead.
2018-11-09 10:38:45 -05:00
Brad King 8d70ed5a10 CMake 3.13.0-rc3 v3.13.0-rc3 2018-11-07 07:50:43 -05:00
Brad King 3bad96c988 Merge branch 'FindOpenMP-log-errors' into release-3.13
Merge-request: !2574
2018-11-07 07:41:34 -05:00
Ivan Pozdeev 272c4c3dee FindOpenMP: Log error output 2018-11-07 07:38:54 -05:00
Ivan Pozdeev db0445f0c8 FindOpenMP: Fix warnings with -Wstrict-prototypes
With -Wstrict-prototype -Werror, the check would fail
2018-11-07 07:38:54 -05:00
Brad King 263d28b256 Merge branch 'cpack-doc-gen-names' into release-3.13
Merge-request: !2563
2018-11-06 11:50:28 -05:00
Brad King 77f8393afe Merge branch 'backport-FindBoost-explicit-arch-tag' into release-3.13
Merge-request: !2568
2018-11-06 11:28:26 -05:00
Brad King 47255060e7 Merge branch 'rename-cpack-ext-generator' into release-3.13
Merge-request: !2566
2018-11-06 11:27:41 -05:00
Craig Scott 12deb051b3 Help: Use correct CPack generator names
CPack generator names were not used consistently
throughout the documentation, resulting in ambiguity
about what the correct name was for use with the
`cpack -G` option. With the changes in this commit, the
cpack-generators(7) page of the manual now shows the
correct names and other help pages no longer use
inconsistent or incorrect names.
2018-11-06 16:42:38 +11:00
Brad King 1e08b625c2 FindBoost: Add explicit Boost_ARCHITECTURE option
Boost 1.66 and above built with `--layout=versioned` add an architecture
tag to the library file names.  We already try to compute this tag
automatically when `CMAKE_CXX_COMPILER_ARCHITECTURE_ID` is available,
but that is currently not computed everywhere.  Add an explicit
`Boost_ARCHITECTURE` option that a user can set to specify the
architecture tag.

Issue: #17701
2018-11-05 10:55:15 -05:00
Brad King fe997d80e0 Merge branch 'blaslapack95' into release-3.13
Merge-request: !2560
2018-11-05 08:11:13 -05:00
Jakub Benda f1a3e4eca8 FindLAPACK: Correct library name and symbol searched in LAPACK95 wrapper
The symbol "CHEEV", originally used to determine if a library provides
Fortran 95 wrappers for LAPACK, has been replaced by "cheev_f95". "CHEEV"
is provided by libmkl_intel_(i)lp64, which does not provide the generic
Fortran 95 wrappers. Instead, libmkl_lapack95_(i)lp64 does; one of the
specializations of the type-generic interfaces contained in that library
is "lapack_f95".

Also, FindLAPACK used libmkl_intel_(i)lp64 instead of the correct
libmkl_lapack95_(i)lp64 library for LAPACK95 functionality. This has
been fixed, too.
2018-11-05 08:00:02 -05:00
Jakub Benda 970b18e9a5 FindBLAS: Correct symbol searched in BLAS95 wrapper
The symbol "SGEMM", originally used to determine if a library provides
Fortran 95 wrappers for BLAS, has been replaced by "sgemm_f95". "SGEMM"
is provided by libmkl_intel_(i)lp64, which does not provide the generic
Fortran 95 wrappers. Instead, libmkl_blas95_(i)lp does; one of the
specializations of the type-generic interfaces contained in that library
is "sgemm_f95".
2018-11-05 08:00:02 -05:00
Craig Scott 20d5e77a27 CPack: Rename Ext generator to External
Ext and External were used inconsistently in the code and the
docs. This change converts all uses of Ext to External, including
within variable names used by the generator.
2018-11-05 07:56:03 -05:00
Brad King 36280e6157 Merge branch 'custom-command-work-dir-genex' into release-3.13
Merge-request: !2559
2018-11-05 07:48:39 -05:00
Brad King 4cd059480a Merge branch 'update-curl' into release-3.13
Merge-request: !2550
2018-11-05 07:48:22 -05:00
Craig Scott 03d00d63df Merge branch 'cpack-gen-docs-link' into release-3.13
Merge-request: !2562
2018-11-05 12:04:40 +11:00
Craig Scott c12eefa8fd Help: Fix generators link in cpack(1) manual
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
2018-11-04 08:50:22 +11:00
Brad King 98d59417b0 add_custom_{command,target}: Fix WORKING_DIRECTORY leading genex
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
2018-11-03 08:39:45 -04:00
Brad King c1ad5118de curl: backport upstream fix to 7.62.0 regression
Backport upstream curl commit 2c5ec339ea (Curl_follow: accept
non-supported schemes for "fake" redirects, 2018-11-01) to get
a fix to curl issue 3210, a regression in 7.62.0.
2018-11-02 08:14:12 -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 03bf934fbe curl: Modernize tiny test code used for build inside CMake
Drop unused code.  Report the error message on failure.
Format the source file using clang-format.
2018-11-01 08:55:50 -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
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 2b3c1bb9b0 curl: Update build within CMake to account for 7.62 changes 2018-10-31 09:50:04 -04:00
Brad King 636bcefeab Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2018-10-30 (19667715)
2018-10-31 09:46:23 -04:00
Curl Upstream 9835e90750 curl 2018-10-30 (19667715)
Code extracted from:

    https://github.com/curl/curl.git

at commit 196677150f711a96c38ed123e621f1d4e995b2e5 (curl-7_62_0).
2018-10-31 09:41:28 -04:00
Brad King 9c6574795c curl: Update script to get curl 7.62.0 2018-10-31 09:40:47 -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 09e36f9978 Merge branch 'FindPostgreSQL-11' into release-3.13
Merge-request: !2547
2018-10-31 09:33:56 -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
Sylvain Joubert eea851bc2e FindPostgreSQL: Search for version 11 2018-10-30 10:04:09 +01: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
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
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
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 97624af751 Merge branch 'doc-updates' into release-3.13
Merge-request: !2530
2018-10-26 09:37:41 -04:00
Marc Chevrier 2f9c253961 Help: clarify "LINKER:" prefix usage
Fixes: #18503
2018-10-26 09:36:53 -04:00