Commit Graph

8797 Commits

Author SHA1 Message Date
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
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
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
09e36f9978 Merge branch 'FindPostgreSQL-11' into release-3.13
Merge-request: !2547
2018-10-31 09:33:56 -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
87d38b4038 Merge branch 'UseSWIG-multi-input' into release-3.13
Merge-request: !2539
2018-10-29 11:47:26 -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
Sylvain Joubert
20fd16e756 UseSWIG: Typo, add missing letter 2018-10-29 15:00:11 +01:00
Brad King
e1dc842cc1 Merge branch 'FindMPI-pthread-cuda' into release-3.13
Merge-request: !2529
2018-10-25 10:48:14 -04:00
Brad King
e2d54e5c40 FindMPI: Pass -pthread to CUDA compiler through -Xcompiler
When adding this flag to imported targets, wrap it in a generator
expression to use `-Xcompiler` to pass the flag for CUDA.

Fixes: #17929
2018-10-25 10:41:19 -04:00
Brad King
ef91680a05 Merge branch 'FindBoost-1.69' into release-3.13
Merge-request: !2522
2018-10-25 07:41:36 -04:00
Mateusz Łoskot
364fb69adc FindBoost: Add support for upcoming Boost 1.69
This makes the module usable with Boost from its current master.
2018-10-25 07:39:48 -04:00
Rolf Eike Beer
83c13ca44f FindThreads: Pass -pthread to CUDA compiler through -Xcompiler
Fixes: #18008
2018-10-24 10:15:41 -04:00
Brad King
718033b97d Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13
Merge-request: !2511
2018-10-22 12:59:23 -04:00
James Clarke
b2d7ab8bd1 GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSD 2018-10-22 12:58:54 -04:00
Kyle Edwards
15bbff0581 DeployQt4: Do not include BundleUtilities at configure time
Due to CMP0080, BundleUtilities can no longer be included at
configure-time. However, DeployQt4 contains some functions which
are meant to be used at configure-time, and some which are meant
to be used at install-time and use BundleUtilities. This change
breaks the file into two sections: common functions and install-time
functions. BundleUtilities is now only included at install-time,
thus fixing the policy warning.

Fixes: #18466
2018-10-19 09:54:10 -04:00
Kyle Edwards
65bea5b90b DeployQt4: Convert to 2-space indentation 2018-10-18 12:03:14 -04:00
Kyle Edwards
9bfb63bd42 Help: Convert DeployQt4 to block-style comment 2018-10-18 12:03:14 -04:00
Brad King
01fae460be Merge branch 'FindPkgConfig-operator-docs' into release-3.13
Merge-request: !2481
2018-10-15 10:16:18 -04:00
Craig Scott
7f2bc70c5e FindPkgConfig: Document support for > and < operators
This was left out of commit v3.13.0-rc1~14^2 (FindPkgConfig: support
also > and < operators for version compares, 2018-10-02).
2018-10-15 10:14:51 -04:00
Brad King
769fc9c4de Merge branch 'FindBoost-mt-release' into release-3.13
Merge-request: !2475
2018-10-11 14:18:49 -04:00
Mario Bielert
9c75922745 FindBoost: Search for -mt variant of release libs
We were searching the `-mt` variant for debug libs only.
It makes sense for release libs too.
2018-10-11 14:16:34 -04:00
Brad King
c9b7cd8ed7 Merge branch 'FindPython-updates' into release-3.13
Merge-request: !2476
2018-10-11 14:14:01 -04:00
Marc Chevrier
e23c41ba78 FindPython*: Add missing registry paths
Fixes: #18443
2018-10-11 14:13:31 -04:00
Brad King
f6193d92fd Merge branch 'FindBISON-fix-verbose-file' into release-3.13
Merge-request: !2467
2018-10-09 09:01:21 -04:00
Brad King
c64797fa94 FindBISON: Fix "multiple rules generate" error on VERBOSE output
When `BISON_TARGET` is called with both

    VERBOSE <extra-file> REPORT_FILE <file>

we add a custom command to copy `<file>` to `<extra-file>`.  The change
in commit v3.7.1~10^2 (FindBISON: Do not rebuild every time when not
VERBOSE, 2016-11-14) incorrectly listed the extra file as an output of
the main bison invocation custom command, but it is actually produced by
the separate copy command.  Fix the logic to always generate `<file>` as
an output of the bison command and `<extra-file>` as an output of the
copy command.

Fixes: #18433
2018-10-09 08:55:54 -04:00
Brad King
0e2799019f Merge branch 'mkl_ilp64' into release-3.13
Merge-request: !2444
2018-10-09 06:28:49 -04:00
Jakub Benda
d0fb3e6c52 Find{BLAS,LAPACK}: Find also ILP64 MKL BLAS and LAPACK
Modern Intel MKL packages offer 64-bit BLAS and LAPACK libraries in any
of the eight combinations of the following three binary options:

  - sequential or threaded
  - LP64 or ILP64
  - static or shared

The modules FindBLAS and FindLAPACK did not allow full selection of
arbitrary combination; in particular, only LP64 variant was used.

The original list of possible BLA_VENDOR values related to MKL,

  Intel10_64lp
  Intel10_64lp_seq

is thus extended by another pair of "vendors",

  Intel10_64ilp
  Intel10_64ilp_seq

Depending on the selection, either "_lp64", or "_ilp64" MKL libraries
are searched for. Some comments in the two CMake modules were modified
to indicate that even though the "vendors" contain the number "10",
they also apply to all further versions of MKL.
2018-10-08 13:21:08 -04:00
Brad King
c780f5eea7 Merge branch 'UseSWIG-php-regression' into release-3.13
Merge-request: !2448
2018-10-08 11:09:18 -04:00
Brad King
d92737821f Merge branch 'autogen-moc-predef-cross-compile' into release-3.13
Merge-request: !2452
2018-10-08 11:09:08 -04:00
Marc Chevrier
ecd0fec40b UseSWIG: fix regression for PHP language
Refactoring in commit v3.12.0-rc1~481^2 (UseSWIG: modernize module,
2018-01-29) accidentally regressed support for PHP.  Fix it.

Fixes: #18421
2018-10-05 13:11:17 -04:00
Brad King
66f49d1f9a Android: Add clang --target= flag to compiler predefines command
When we set `CMAKE_<LANG>_COMPILER_TARGET` to the Android target
architecture, add it to `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND` also.
This is needed to make moc predefines aware of `__ANDROID__`.

Fixes: #18425
2018-10-05 10:23:52 -04:00
Brad King
39534c58c5 Autogen: Add clang --target= flag to compiler predefines command
Respect the compiler target value `CMAKE_<LANG>_COMPILER_TARGET` in
`CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND`.

Issue: #18425
2018-10-05 10:23:52 -04:00
Brad King
a9ff6cefe5 Merge branch 'pkgc-op-lt-gt' into release-3.13
Merge-request: !2435
2018-10-04 10:35:39 -04:00
Rolf Eike Beer
aa51bfd74f FindPkgConfig: support also > and < operators for version compares
Fixes: #18416
2018-10-04 10:32:13 -04:00
Brad King
a9b442cdc7 Merge branch 'misc-typos' into release-3.13
Merge-request: !2440
2018-10-04 10:13:12 -04:00