Commit Graph

9104 Commits

Author SHA1 Message Date
Brad King
a63a9363b2 Merge topic 'FindICU-link-dl'
1320122d3f FindICU: Add libdl to the link libraries for icu-uc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Francois Budin <francois.budin@kitware.com>
Merge-request: !2581
2018-11-12 08:18:47 -05:00
Brad King
baf8af10a7 Merge topic 'asm-compiler-id-clang'
c84fb4812d ASM: Detect compiler id for Clang used as Assembler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2584
2018-11-12 08:16:28 -05:00
Brad King
7704693e9a Merge topic 'FindBoost-compiler-guess-update'
b71667a395 FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2579
2018-11-12 08:14:48 -05:00
Joachim Wuttke (h)
1c94129e98 Help: correct macro -> function in CMakePrintHelpers
and apply lower case throughout
2018-11-11 23:18:37 +01:00
Joachim Wuttke (h)
b93b3b5500 Help: better summary and xrefs for CMakeAddFortranSubdirectory 2018-11-11 22:57:13 +01:00
Marc Chevrier
c4b4d8b3a6 POSITION_INDEPENDENT_CODE: Manage link flags for executables
Fixes: #14983, #16561
2018-11-11 17:34:09 +01:00
Mateusz Łoskot
4e4551f9f3 FindODBC: Do not assume odbc32.lib for MinGW
For MinGW, do not look for odbc32.lib but allow search for libodbc32.a.

Fixes: #18539
2018-11-09 19:49:05 +01:00
Brad King
abe1a345b2 Merge branch 'FindBoost-compiler-guess-update' into release-3.13
Merge-request: !2579
2018-11-09 11:53:31 -05:00
Mateusz Łoskot
b71667a395 FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+
Add recognition of compiler version and prefix for clang.
Accommodate changes to version numbering scheme for GCC 5+ and clang 4+
 - Minor number becomes patch, so excluded it from compiler prefix.
 - Improves searching for Boost 1.69+ libraries built with GCC 5+ and
   clang 4+, where library names are generated with compiler tag based on
   major version only eg. -gcc5 for GC 5.5.0 or -clang6 for clang 6.0.0
 - Follows up related changes in upcoming Boost 1.69
   https://github.com/boostorg/build/pull/349
Dump detected compiler version in Boost_DEBUG message.
Replace use of CMAKE_COMPILER_IS_GNUCXX with CMAKE_CXX_COMPILER_ID.
2018-11-09 11:52:43 -05:00
Brad King
51bf23ed74 Merge branch 'asm-compiler-id-clang' into release-3.13
Merge-request: !2584
2018-11-09 11:45:30 -05:00
Brad King
a027128400 Merge topic 'FindBoost-link-threads'
bd831ed094 FindBoost: Add system thread library to Boost_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2570
2018-11-09 11:38:07 -05:00
Brad King
c84fb4812d ASM: Detect compiler id for Clang used as Assembler
Add missing vendor table entries for Clang and AppleClang to identify
them.  Previously this worked only if Clang was also enabled as a C or
CXX compiler first because we used to copy the C compiler id.  However,
that was removed by commit v3.13.0-rc1~44^2 (ASM: Search for full path
even when using C or C++ compiler, 2018-09-26).

Fixes: #18575
2018-11-09 11:34:34 -05:00
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
Cameron Cawley
1320122d3f FindICU: Add libdl to the link libraries for icu-uc 2018-11-08 11:29:27 -05:00
Marc Chevrier
724a0346f7 POSITION_INDEPENDENT_CODE: Fix erroneous '-fPIE' flag for Sun Studio
Fixes: #16311
2018-11-08 14:58:57 +01:00
Brad King
a4add4eca2 Merge topic 'pkgconfig-mark-advanced'
f5c46dd84e PkgConfig: Be less verbose by mark(ing)_as_advanced the find_library result

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !2576
2018-11-08 07:31:30 -05:00
Brad King
a848abe24c Merge topic 'find-jpeg-turbo-multiarch-version'
1c4c4be509 FindJPEG: handle multiarch installs of libjpeg-turbo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2572
2018-11-08 07:30:51 -05:00
Sylvain Joubert
f5c46dd84e PkgConfig: Be less verbose by mark(ing)_as_advanced the find_library result 2018-11-07 14:08:02 +01:00
Brad King
a67d1e824c Merge topic 'FindOpenMP-log-errors'
272c4c3dee FindOpenMP: Log error output
db0445f0c8 FindOpenMP: Fix warnings with -Wstrict-prototypes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Christian Pfeiffer <cpfeiffer@live.de>
Merge-request: !2574
2018-11-07 07:46:40 -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
389002de96 Merge topic 'FindSQLite3-module'
fe40570608 FindSQLite3: Add module to find SQLite3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2557
2018-11-07 07:26:46 -05:00
Ben Boeckel
1c4c4be509 FindJPEG: handle multiarch installs of libjpeg-turbo
Fedora installs a `jconfig-32.h` and `jconfig-64.h` which were not
searched. Instead, glob up all `jconfig` headers and bail once we've
found a version number.
2018-11-06 16:45:52 -05:00
Chuck Atkins
fe40570608 FindSQLite3: Add module to find SQLite3 2018-11-06 15:05:04 -05:00
Brad King
bfdd1ba604 Merge topic 'FindPostgreSQL-target'
575e2cc35d FindPostgreSQL: extract the actual version number
7413f29fe6 Tests/FindPostgreSQL: add a test for FindPostgreSQL
d2235fd253 FindPostgreSQL: add an imported target
7a801b7dfb FindPostgreSQL: Modernize documentation layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2555
2018-11-06 11:40:16 -05:00
Brad King
7bed050755 Merge topic 'autogen_origin_depends'
47f9c15c60 Autogen: Update <ORIGIN>_autogen target documentation
336893d9eb Autogen: Separate AUTOGEN_TARGET_DEPENDS tests into own tests suite
846043dd35 Autogen: Rename MocDepends test to AutogenOriginDependsOn
b71a9598a4 Autogen: Add test for AUTOGEN_ORIGIN_DEPENDS=OFF
f74c406501 Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS release notes
0669de5d36 Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS documentation
b5e895b5d4 Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2518
2018-11-06 11:38:23 -05:00
Brad King
f55b7bdc5d Merge topic 'FindBoost-explicit-arch-tag'
3f22656d8c Merge branch 'backport-FindBoost-explicit-arch-tag'
1e08b625c2 FindBoost: Add explicit Boost_ARCHITECTURE option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2568
2018-11-06 11:31:55 -05:00
Brad King
1674a5b0a4 Merge topic 'rename-cpack-ext-generator'
20d5e77a27 CPack: Rename Ext generator to External

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2566
2018-11-06 11:30:27 -05:00
Brad King
c752edfcb3 Merge topic 'blaslapack95'
f1a3e4eca8 FindLAPACK: Correct library name and symbol searched in LAPACK95 wrapper
970b18e9a5 FindBLAS: Correct symbol searched in BLAS95 wrapper

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2560
2018-11-06 11:29:42 -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
Brad King
3f22656d8c Merge branch 'backport-FindBoost-explicit-arch-tag' 2018-11-05 11:45:58 -05:00
Ben Boeckel
575e2cc35d FindPostgreSQL: extract the actual version number
The `PG_VERSION` variable can be mangled by distributions to indicate
things like the name of the distro and package build numbers.

However, `PG_VERSION_NUM` is new in 8.2 (2006), so keep the old
extraction code around for old versions.
2018-11-05 11:13:33 -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
Sebastian Holtermann
b5e895b5d4 Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS support
This adds

- the variable ``CMAKE_AUTOGEN_ORIGIN_DEPENDS`` which initializes
- the target property ``AUTOGEN_ORIGIN_DEPENDS``

which controls whether or not the origin target dependencies
should be forwarded to the corresponding ``_autogen`` target.

The default value of ``CMAKE_AUTOGEN_ORIGIN_DEPENDS`` is ``ON``
which corresponds to the behavior that is in place since CMake 3.9.

Closes: #18493
2018-11-03 12:14:40 +01: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
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
Ben Boeckel
d2235fd253 FindPostgreSQL: add an imported target 2018-11-01 13:23:33 -04:00
Brad King
7a801b7dfb FindPostgreSQL: Modernize documentation layout 2018-11-01 13:22:01 -04:00
Ben Boeckel
22ba9b6a32 FindGDAL: set the GDAL_VERSION 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
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
8f043068d5 Merge branch 'FindProtobuf-threads' into release-3.13
Merge-request: !2551
2018-10-31 10:29:14 -04:00