Commit Graph

8194 Commits

Author SHA1 Message Date
Brad King
d08f3f551f Merge topic 'unhardcode-configuration-types'
1f4d7a07 Help: Add references and backticks in LINK_FLAGS prop_tgt
48f7e2d3 Unhardcode the CMAKE_CONFIGURATION_TYPES values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1345
2018-01-10 10:35:04 -05:00
Brad King
ce629c5dde Merge topic 'FindPostgres_support_for_v10'
9417a6d3 FindPostgreSQL: Add support for PG10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1635
2018-01-09 09:45:45 -05:00
Egor Pugin
9417a6d322 FindPostgreSQL: Add support for PG10 2018-01-09 09:43:41 -05:00
Brad King
ae89a6e110 Merge topic 'cpack_versions'
e4153640 Cpack.cmake: Document some CPACK_* default values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1608
2018-01-09 09:38:02 -05:00
Brad King
5fbfa18fad Merge topic 'FindCUDA-deduplicate-c+std-host-flags'
ff41a4b8 FindCUDA: de-duplicates C++11 flag when propagating host flags.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1628
2018-01-09 09:26:51 -05:00
Brad King
bc88329e5b Merge topic 'msvc2017-findcuda'
fab1b432 FindCUDA: Update to properly find MSVC 2017 compiler tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1631
2018-01-09 09:26:20 -05:00
Beren Minor
48f7e2d300 Unhardcode the CMAKE_CONFIGURATION_TYPES values
This removes duplicated code for per-config variable initialization by
providing a `cmake_initialize_per_config_variable(<PREFIX> <DOCSTRING>)`
function.

This function initializes a `<PREFIX>` cache variable from `<PREFIX>_INIT`
and unless the `CMAKE_NOT_USING_CONFIG_FLAGS` variable is defined, does
the same with `<PREFIX>_<CONFIG>` from `<PREFIX>_<CONFIG>_INIT` for every
`<CONFIG>` in `CMAKE_CONFIGURATION_TYPES` for multi-config generators or
`CMAKE_BUILD_TYPE` for single-config generators.
2018-01-08 21:15:14 +01:00
Aaron Bray
fab1b432eb FindCUDA: Update to properly find MSVC 2017 compiler tools
An implementation that handles the different installation locations of
visual studio compiler tools
2018-01-08 11:35:36 -05:00
Brad King
f7f34a46e6 Merge topic 'use_generator_is_multi_config'
3c413e2a GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Modules
c267ea1c GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1627
2018-01-08 11:14:16 -05:00
Brad King
a3bba2a5ad Merge topic '17431-iphone-deployment-target'
4017bf40 Darwin: Emit deployment target that matches the SDK
8f4663ff Xcode: rename embedded SDK query function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1447
2018-01-08 09:58:11 -05:00
David Hirvonen
ff41a4b817 FindCUDA: de-duplicates C++11 flag when propagating host flags. 2018-01-06 17:00:09 -05:00
Craig Scott
d88451568d Merge topic 'various-typos'
3ab7bf82 Various typo fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1626
2018-01-04 14:37:49 -05:00
Luz Paz
3ab7bf8285 Various typo fixes
Some are user-facing. Others are source comments.
2018-01-04 06:52:01 +11:00
Craig Scott
1e6d1dd358 FindDoxygen: Add DOXYGEN_VERBATIM_VARS for quote prevention
Each CMake variable listed in DOXYGEN_VERBATIM_VARS will not have any
automatic quoting applied to it when written to the Doxyfile.
2018-01-03 07:59:59 +11:00
Craig Scott
3c413e2a31 GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Modules 2017-12-30 09:35:56 +11:00
Gregor Jasny
4017bf40de Darwin: Emit deployment target that matches the SDK
Closes: #17431
2017-12-22 21:56:53 +01:00
Brad King
4309ed25ee Merge topic 'FindPkgConfig_search_path_fix'
40b95ee8 FindPkgConfig: Fix IMPORTED_TARGET NO...PATH option handling
b0ff528a FindPkgConfig: Make IMPORTED_TARGET test verify NO...PATH properly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !1602
2017-12-22 08:43:05 -05:00
Brad King
4148435993 Merge topic 'cpackifw-package-remove-target-dir'
739ae1d0 CPack/IFW: Add option to control deletion of the install directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1591
2017-12-21 08:01:34 -05:00
Brad King
70fba77b26 Merge topic 'FindBLAS-modernize'
a9c42e3e FindBLAS: optionally query pkg-config for a library
c095e2ad FindBLAS: simplify if()
fcf32645 FindBLAS: use FPHSA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1599
2017-12-21 07:58:10 -05:00
Harry Mallon
e415364058 Cpack.cmake: Document some CPACK_* default values 2017-12-20 13:40:28 +00:00
Christian Pfeiffer
0816f7496b Merge topic 'findliblzma-win-name'
de706fe0 FindLibLZMA: Add library name for Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1605
2017-12-18 17:05:22 -05:00
Christian Pfeiffer
de706fe0d4 FindLibLZMA: Add library name for Windows
Fixes: #17568
2017-12-18 03:34:49 +01:00
Craig Scott
40b95ee8e6 FindPkgConfig: Fix IMPORTED_TARGET NO...PATH option handling 2017-12-16 22:40:40 +11:00
Rolf Eike Beer
a9c42e3ec0 FindBLAS: optionally query pkg-config for a library
This is more or less what Gentoo implements for years, but in a more
sophisticated version that uses the target mode now offered by
pkg_check_modules().
2017-12-15 21:24:25 +01:00
Rolf Eike Beer
c095e2ad54 FindBLAS: simplify if() 2017-12-15 21:10:25 +01:00
Rolf Eike Beer
fcf3264594 FindBLAS: use FPHSA 2017-12-15 21:10:25 +01:00
Jean-Philippe Lebel
739ae1d090 CPack/IFW: Add option to control deletion of the install directory
Added support for QT IFW "RemoveTargetDir" boolean option.  QTIFW
supports an option to prevent, or not, deletion of the installation
directory. This is a direct pass-through to that variable.
2017-12-15 13:24:58 -05:00
Brad King
f67f76c2b3 Merge topic 'FindFLTK-per-config'
f1299f5d FindFLTK: Find debug and release variants separately
d9154e52 FindFLTK: revise .rst markup
ccc9a6c7 FindFLTK: fix indentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1563
2017-12-15 10:43:07 -05:00
Brad King
6fb568cef6 Merge topic 'makefile-simplify-fortran'
7ab9a625 Makefiles: Drop 'requires' step and its supporting infrastructure
5f2e2c38 Makefiles: Avoid nested make calls for Fortran module dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1523
2017-12-15 10:42:12 -05:00
Stefano Sinigardi
f1299f5d82 FindFLTK: Find debug and release variants separately 2017-12-14 08:36:23 -05:00
Stefano Sinigardi
d9154e521a FindFLTK: revise .rst markup 2017-12-14 08:36:23 -05:00
Stefano Sinigardi
ccc9a6c706 FindFLTK: fix indentation 2017-12-14 08:36:19 -05:00
Yurii Batrak
7ab9a62572 Makefiles: Drop 'requires' step and its supporting infrastructure
The 'requires' step was used to provide implicit dependencies between
the generated Fortran module files and a Fortran target that needs these
module files to ensure the correct compilation order.  After recent
refactoring to resolve all dependencies explicitly through `.mod.stamp`
make targets, the separate 'requires' step is not needed anymore.
2017-12-14 08:22:07 -05:00
Brad King
671958d288 Merge topic 'irsl-intel-fortran-only-fix'
7d1ed84c IRSL: Skip libgfxoffload if no Intel C++ is used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1589
2017-12-14 08:18:53 -05:00
Brad King
a363c9356d Merge topic 'findmpi-builtin-fix'
d1d8719f FindMPI: Fix various legacy problems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1569
2017-12-13 07:52:54 -05:00
Brad King
f0b3fab179 Merge topic 'irsl-msvc-omp-fix'
4dae55fb IRSL: Fix MSVC variable deferencing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1588
2017-12-13 07:50:52 -05:00
Brad King
95e86eafd7 Merge topic 'FindPerlLibs-MacOS-failure'
a6005371 FindPerlLibs: Add support for MSYS and CYGWIN
362a1f33 FindPerlLibs: refactoring
c365a078 FindPerlLibs: fix MacOS failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1586
2017-12-13 07:50:02 -05:00
Brad King
38b4209100 Merge branch 'irsl-msvc-omp-fix' into release-3.10
Merge-request: !1588
2017-12-12 09:33:10 -05:00
Brad King
19d5969d37 Merge branch 'findmpi-builtin-fix' into release-3.10
Merge-request: !1569
2017-12-12 09:31:18 -05:00
Christian Pfeiffer
4dae55fb70 IRSL: Fix MSVC variable deferencing
Fixes: #17529
2017-12-12 15:16:38 +01:00
Christian Pfeiffer
7d1ed84cea IRSL: Skip libgfxoffload if no Intel C++ is used
`libgfxoffload` is only used and installed by the Intel C/C++ compilers
and will be unavailable if only Intel Fortran has been installed.

Fixes: #17550
2017-12-12 14:43:08 +01:00
Christian Pfeiffer
d1d8719f62 FindMPI: Fix various legacy problems
This MR fixes a number of bugs stemming from legacy variable handling,
partially introduced by commit v3.10.0-rc1~103^2 (FindMPI: Add support
for FreeBSD and SLES, 2017-08-09).

* `MPI_COMPILE_OPTIONS` and `MPI_COMPILE_DEFINITIONS` legacy hints were not passed correctly.
* Legacy variables could be parsed after they were set by `FindMPI` cause erroneous hinting on subsequent runs.
* In the case of the compiler supporting MPI implicitly:
	* not all consumption variables would be correctly reset.
	* `MPI_<LANG>_HEADER_DIR` would be set unintentionally.
	* `MPI_<LANG>_LIB_NAMES` appeared in cache despite being ignored.
	* on subsequent passes, `MPI_<LANG>_COMPILER` could be corrupted.
* the C-to-CXX copy logic would take place even if `MPI_SKIP_GUESSING` was turned on
* if only some language compilers were given, inconsistent search behavior could be observed

Issue: #17538
2017-12-12 14:20:02 +01:00
Brad King
77aab3e515 Merge topic 'FindPkgConfig_doc_cleanup'
adf49137 FindPkgConfig: Cleanup docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1584
2017-12-12 08:03:57 -05:00
Brad King
57199deafa Merge topic 'fix-iar-binutils-for-cxx'
e4707048 IAR: FindBinUtils should work for CXX as well as C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1572
2017-12-12 08:02:55 -05:00
Brad King
e2303b257c Merge branch 'fix-iar-binutils-for-cxx' into release-3.10
Merge-request: !1572
2017-12-12 08:00:44 -05:00
Islam Amer
e4707048c0 IAR: FindBinUtils should work for CXX as well as C
The IAR compiler test works when a project specifies LANGUAGES C CXX
but fails if CXX comes before C. This change makes it work regardless
of the order.
2017-12-12 08:00:16 -05:00
Marc Chevrier
a6005371b0 FindPerlLibs: Add support for MSYS and CYGWIN 2017-12-12 11:42:28 +01:00
Marc Chevrier
362a1f336d FindPerlLibs: refactoring
Use a dedicated function (perl_get_info) to retrieve various configuration information
2017-12-12 09:41:16 +01:00
Marc Chevrier
c365a07870 FindPerlLibs: fix MacOS failure
Fix library paths computation on MacOS

Fixes: #12544
2017-12-12 09:38:39 +01:00
Craig Scott
adf4913795 FindPkgConfig: Cleanup docs
- Moved block of misplaced comments to correct section
- Improved grammar, readability and consistency
- Updated to conform to style guidelines
2017-12-10 22:50:39 +11:00