Commit Graph

37317 Commits

Author SHA1 Message Date
Brad King eb3abf8b2b C++ feature checks: Prepare for multiple check output filters 2017-09-19 09:22:54 -04:00
Brad King 4547d9a830 Merge topic 'ranged-for'
f43baf69 Meta: modernize old-fashioned loops to range-based `for` (CPack).

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1274
2017-09-19 09:07:48 -04:00
Brad King 7c28081c14 Merge topic 'string-clear'
5db3aac1 Meta: replace empty-string assignments with `clear()`.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1276
2017-09-19 08:27:00 -04:00
Brad King 8fee054eca Merge topic 'vs-manifestuac-flag-map'
3232f84c VS: Fix MANIFESTUAC link flag map to .vcxproj elements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !526
2017-09-19 08:25:22 -04:00
Brad King 71c752a63b Merge topic 'gtest-fix-windows-linking'
e2cca9f8 FindGTest: Avoid macro name collision
4636c64b FindGTest: Improve test to catch link error
35061791 FindGTest: Fix shared linking on Windows
9fd9e448 FindGTest: Avoid using find_dependency in a find module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1267
2017-09-19 08:24:25 -04:00
Brad King d947310f17 Merge topic 'FindBoost-IN_LIST'
a929dd16 FindBoost: Simplify search in lists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1281
2017-09-19 08:15:36 -04:00
Brad King 3be6835ed1 Merge topic 'target_system_docs'
77eb212d Help: Clarify/make consistent the APPLE, UNIX and WIN32 variable docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1279
2017-09-19 08:13:39 -04:00
Pavel Solodovnikov f43baf6981 Meta: modernize old-fashioned loops to range-based for (CPack).
Changes done via `clang-tidy` with some manual fine-tuning
for the variable naming and `auto` type deduction
where appropriate.
2017-09-19 08:06:08 -04:00
Kitware Robot 2bfb434e84 CMake Nightly Date Stamp 2017-09-19 00:01:05 -04:00
Alex Turbov a929dd166e FindBoost: Simplify search in lists
Instead of `list(FIND...)` and then checking result for `-1`
(found/not-found), nowadays `if` command has the `IN_LIST` test for
that.

This change was originally made by commit v3.9.0-rc1~41^2 (FindBoost:
Simplify search in lists, 2017-04-23) but then had to be reverted by
commit v3.9.2~3^2 (FindBoost: Revert "Simplify search in lists.",
2017-09-05) due to problems related to using `find_dependency`.  Those
problems were addressed by commit 3080a0a611 (FindBoost: Improve
behavior when thread dependency is missing, 2017-09-15), so now we can
restore the original change.

Issue: #17252
2017-09-18 13:44:25 -04:00
comicfans 3232f84c19 VS: Fix MANIFESTUAC link flag map to .vcxproj elements
Add special parsing of the flags given in `/MANIFESTUAC:"..."` in order
to map them correctly to `.vcxproj` elements.

Keep the old incorrect flag table entries for `uiAccess` and `level`
flags for compatibility even though they do not really exist.

Fixes: #16563
2017-09-18 11:53:22 -04:00
Brad King a1cdf537ff Merge topic 'ctest-runcommand'
67529aab Doc: document that CoverageExtraFlags will come first
69fac3c3 pass arguments as vector to cmCTest::RunCommand()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1261
2017-09-18 10:16:08 -04:00
Brad King bc2009b724 Merge topic 'findmpi-overhaul'
bf1e606f FindMPI: Add support for FreeBSD and SLES
2f673da6 FindMPI: Support components for various languages
9a58e69c FindMPI: Modernization from ground up

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !893
2017-09-18 10:11:04 -04:00
Brad King d31b1c0e99 Merge topic 'FindBoost-no-find_dependency'
3080a0a6 FindBoost: Improve behavior when thread dependency is missing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1272
2017-09-18 10:09:48 -04:00
Brad King 836f42b3c0 Merge topic 'cmake-gui-high-dpi'
6fb36572 cmake-gui: Enable High DPI scaling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1271
2017-09-18 10:08:59 -04:00
Brad King dd77a2ed4d Merge topic 'libuv-bootstrap'
714ce728 bootstrap: Make libuv available during bootstrap
6a2d967d bootstrap: Require compiler mode aware of C99 on Solaris

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1131
2017-09-18 10:08:07 -04:00
Brad King ce4f635409 Merge topic 'cxx11-override'
98530d3c cm_codecvt: Tell IWYU to keep cmConfigure.h
4e14498f Drop now-unused definition of CM_OVERRIDE
0b33aee4 Use C++11 override instead of CM_OVERRIDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1265
2017-09-18 10:06:47 -04:00
Brad King c29e85d009 Merge topic 'test-cleanups'
7200ab49 Tests: Fix CMake syntax warning in VSGNUFortran test
9da13bc3 Tests: Fix some references to 'cmake' executable
f1f109e9 Tests: Drop tests that have not run for over 10 years

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1270
2017-09-18 10:06:10 -04:00
Matthew Woehlke e2cca9f8ee FindGTest: Avoid macro name collision
Use two _'s for private function/macro names rather than one. This
avoids a potential collision if a function/macro with no leading _ that
otherwise matches the name of a private function/macro also overrides a
built-in function or is defined twice.
2017-09-18 10:01:36 -04:00
Matthew Woehlke 4636c64bfe FindGTest: Improve test to catch link error
Add a reference to one of Google Test's command-line flags to the
FindGTest test. This will ensure that we are using the correct compile
definitions on Windows, as the test will otherwise fail to link. (IOW,
this tests the changes made by the previous commit.)
2017-09-18 10:01:15 -04:00
Matthew Woehlke 3506179145 FindGTest: Fix shared linking on Windows
Add logic to FindGTest.cmake to attempt to determine if the libraries
are shared or static. If the libraries are shared, add an interface
compile definition that is needed in some cases for successful linking
on Windows.

See also https://github.com/google/googletest/issues/877.
2017-09-18 10:01:13 -04:00
Brad King 507a0fd60e Merge branch 'release-3.9' 2017-09-18 09:04:17 -04:00
Brad King ed74d9e2eb Merge topic 'backport-FindBoost-1.65'
ee1f8903 FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake 3.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1280
2017-09-18 09:02:21 -04:00
Brad King d44202ef05 Merge branch 'backport-FindBoost-1.65' into release-3.9
Merge-request: !1280
2017-09-18 08:59:30 -04:00
Roger Leigh ee1f890332 FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake 3.9
Backport the changes from commit fa114e7d70 (FindBoost: Add Boost 1.65
dependencies, 2017-08-22) and commit dbba53a5aa (FindBoost: Add version
1.65.1, 2017-09-06) to CMake 3.9.

Fixes: #17289
2017-09-18 08:57:18 -04:00
Brad King f5338f799d Merge topic 'revert-vim-no-tabs'
0d543589 vim: Remove default setting of expandtab

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Maurice <m-ou.se@m-ou.se>
Merge-request: !1273
2017-09-18 08:52:12 -04:00
Brad King c727459da9 Merge branch 'revert-vim-no-tabs' into release-3.9
Merge-request: !1273
2017-09-18 08:44:55 -04:00
Maarten de Vries 0d543589b9 vim: Remove default setting of expandtab
An update from vim-cmake-syntax by commit v3.9.0-rc1~167^2^2
(vim-cmake-syntax 2017-05-02, 2017-05-02) brought in a change to set
`expandtab` in CMake language files.  This should be a per-project or
per-user choice instead, so drop the setting.
2017-09-18 08:41:53 -04:00
Craig Scott 77eb212d07 Help: Clarify/make consistent the APPLE, UNIX and WIN32 variable docs 2017-09-18 18:57:12 +10:00
Kitware Robot 14ffd3b7e9 CMake Nightly Date Stamp 2017-09-18 00:01:03 -04:00
Brad King 714ce72882 bootstrap: Make libuv available during bootstrap
On UNIX, build only the parts of libuv we need for the filesystem,
process, and poll abstractions using the POSIX poll() backend.  This
avoids many platform-specific conditions.  On Windows, build all of
libuv; there are no conditional alternatives anyway.
2017-09-17 11:10:18 -04:00
Brad King 6a2d967de0 bootstrap: Require compiler mode aware of C99 on Solaris
On Solaris some system headers included in C with `-D_XOPEN_SOURCE=600`
require C99 support by the compiler.
2017-09-17 11:10:18 -04:00
Kitware Robot 214d0ce170 CMake Nightly Date Stamp 2017-09-17 00:01:03 -04:00
Kitware Robot db86cf4e7e CMake Nightly Date Stamp 2017-09-16 00:01:03 -04:00
Pavel Solodovnikov 5db3aac111 Meta: replace empty-string assignments with clear(). 2017-09-16 02:26:49 +03:00
Rolf Eike Beer 67529aab81 Doc: document that CoverageExtraFlags will come first 2017-09-15 17:50:56 +02:00
Rolf Eike Beer 69fac3c3d5 pass arguments as vector to cmCTest::RunCommand()
The only 2 callers took care to construct a properly escaped string, but not
using the documented way, and that string was passed only to be immediately
split into tokens again. Start with a vector and join it only for logging,
avoiding needless quotes during that.
2017-09-15 17:50:56 +02:00
Brad King 98530d3c14 cm_codecvt: Tell IWYU to keep cmConfigure.h
We no longer need it explicitly for `CM_OVERRIDE`, but we still need to
include it first everywhere.
2017-09-15 11:41:49 -04:00
Luis Caro 6fb36572dc cmake-gui: Enable High DPI scaling
This Qt flag enables UI scaling based on scale factor provided by the
operating system.  Only supported on versions of Qt >= 5.6.

The flag has no effect on macOS, where high DPI support is already
enabled as a setting in the bundle's info.plist.

Fixes: #17026
2017-09-15 10:54:36 -04:00
Brad King 7200ab491b Tests: Fix CMake syntax warning in VSGNUFortran test 2017-09-15 10:49:42 -04:00
Brad King 9da13bc3f7 Tests: Fix some references to 'cmake' executable
Use `${CMAKE_CMAKE_COMMAND}` rather than `cmake` or `${CMAKE_COMMAND}`
in order to ensure we always refer to the `cmake` command being tested.
2017-09-15 10:49:12 -04:00
Brad King 3080a0a611 FindBoost: Improve behavior when thread dependency is missing
The `find_dependency` macro is not meant for use in find modules and
`return()`s from the caller when the package is not found.  Avoid using
it in FindBoost.  Instead use plain `find_package` for the Threads
package and manually forward the `QUIET` argument.  When the Threads
package is missing then treat the Boost `thread` component as missing.

Issue: #17257
2017-09-15 10:42:14 -04:00
Brad King 4e14498f4f Drop now-unused definition of CM_OVERRIDE 2017-09-15 10:06:41 -04:00
Brad King 0b33aee48b Use C++11 override instead of CM_OVERRIDE
We now require C++11 support including `override`.  Drop use of
the old compatibility macro.  Convert references as follows:

    git grep -l CM_OVERRIDE -- '*.h' '*.hxx' '*.cxx' |
      xargs sed -i 's/CM_OVERRIDE/override/g'
2017-09-15 10:06:41 -04:00
Brad King f1f109e971 Tests: Drop tests that have not run for over 10 years 2017-09-15 08:58:02 -04:00
Christian Pfeiffer bf1e606f60 FindMPI: Add support for FreeBSD and SLES
Fixes: #17117
2017-09-15 14:55:08 +02:00
Christian Pfeiffer 2f673da69f FindMPI: Support components for various languages 2017-09-15 14:55:08 +02:00
Christian Pfeiffer 9a58e69cc8 FindMPI: Modernization from ground up
This is a near-total rewrite of FindMPI implementing the following
features:

Environmental improvements:

- C++ settings can now be picked from C settings if no dedicated C++
  settings are found (some installs of IBM Platform MPI)
- Fortran settings can now be found on MPICH-1, MVAPICH-1, Microsoft
  MPI and MPICH-2 on Windows.

- Improved flag procession logic: Flags related to security enhancements
  of MPI itself, and unrelated to MPI usage (-fstack-protector-strong on
  e.g. RHEL 7 for MPICH and MVAPICH) will be filtered out properly now.
  -pthread is now being handled. -fno-strict-aliasing, which may be needed
  while compiling MVAPICH (e.g. RHEL 7's MVAPICH package) is also
  filtered.

Features added:

- MPI version can be determined for each language and is exposed as the
  package version
- MPI functionality is being tested to ensure the correctness of
  settings
- MPI-2 C++ bindings can be suppressed if desired by the project or
  user. For older MPIs, this often resolves issues and eliminated the
  infamous SEEK_SET trouble.
- MPI-2 C++ bindings are now being searched for and exposed by a
  variable if detected.
- Fortran support now does not make assumptions over the MPI present and
  works with ILP64 MPI implementations.
- Fortran now exposes which bindings (mpif.h, mpi/mpi_f08 modules) are
  available
- MPI detection can now work hybridly, which for example permits using the
  Fortran modules shipped with some compiler suites together with MPI
  (e.g. PGI on Windows shipping MSMPI modules)
- Ability to determine MPI library version (*requires* try_run, caution)
  upon request
- Ability to determine Fortran capabilities from MPI-3 for each of the
  bindings (subarrays, asynchronous attribute protecting entities) (also
  requires try_run)

Fine grained control over the search process:

- Possibility to selectively enable and disable steps like compiler
  wrapper search and guessing. Permits picking Microsoft MPI over Intel
  MPI if both are loaded (previously not possible without removing the
  IMPI compiler wrappers from the environment)
- Ability to pick MPICH2 over MSMPI (previously the first one located
  was taken)
- A user may now pass compiler flags to the compiler wrapper script,
  enabling much more flexibility. This permits for example linking the
  Intel MPI debug runtime, static linking, ILP64 with Fortran,
  linking tracing, ...
- A user may define a suffix for all MPI binaries that are being looked
  for (useful on Debian/Ubuntu where the alternative MPI installs are each
  appended with their name, e.g. mpicc.mpich and mpicc.lam)

Cache variable improvements

- Instead of the previous plural cache variables a list-of-variables
  approach is now in place. Permits correcting individual variables
  instead of having to wade through a list, also speeds up the search
  process and increases comfort by eliminating duplicate entries in
  LIBRARIES over languages
- MPIEXEC was corrected to MPIEXEC_EXECUTABLE in order to fix the
  grouping in the CMake GUI for the variable (previously ungrouped)
2017-09-15 14:55:08 +02:00
Brad King c0c5f924fe Merge topic 'refactor-iwyu-code'
3bbe95f5 Clean up iwyu code to not be one big if statement.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1247
2017-09-15 08:54:32 -04:00
Brad King 3449c18c36 Merge topic 'findopenmp-components'
d25f30a6 FindOpenMP: Add support for components
23530151 FindOpenMP: Minor environmental improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1266
2017-09-15 08:54:03 -04:00