Commit Graph

34697 Commits

Author SHA1 Message Date
Kitware Robot
d5f0c69611 CMake Nightly Date Stamp 2017-02-04 00:01:05 -05:00
Zack Galbreath
9d34e51cdb AndroidTestUtilities: ignore exit status of ls
adb used to suffer from a bug where `adb shell` would return 0 irrespective
the exit status of the underlying process that it executed.  This is now
fixed for newer versions of Android (N+).

As a result, attempting to `adb shell ls` a nonexistent file can now result
in a non-zero exit status.  Updating check_device_file_exists to ignore the
exit status of `adb shell` fixes this bug for newer Android devices.
2017-02-03 13:22:36 -05:00
Brad King
cf0d8f1fd6 FindHDF5: Restore HDF5_INCLUDE_DIR in all code paths
This compatibility variable should be set no matter which method was
used to find HDF5.  Even if `HDF5_INCLUDE_DIRS` was set by copying the
`HDF5_INCLUDE_DIR` value from `hdf5-config.cmake` it will not hurt to
copy the same value back.

Issue: #16566
2017-02-03 10:57:10 -05:00
Brad King
fb26fcb261 Merge topic 'gcc-features'
37ed860a GNU C++: record that -fvisibility-inlines-hidden is available since 4.0
94a8ee6f GNU C: record that C99 is available since at least 3.4
940bf6a4 Tests/Module/WCDH: only use -Werror=undef compiler flag if actually supported
f26ca5a1 Tests/Module/WCDH: write multi_file_compiler_detection.h before using it
2017-02-03 09:32:45 -05:00
Brad King
5564c01703 FindHDF5: Restore fallback to static libraries
Since commit v3.6.1~6^2~2 (FindHDF5: Fix h5cc arg parsing to work with
homebrew on Mac, 2016-07-11) we treated `HDF5_USE_STATIC_LIBRARIES` OFF
as a requirement for shared libraries.  It is just supposed to be a
preference.  Even if `HDF5_USE_STATIC_LIBRARIES` is not set we should
still fall back to finding static libraries if shared libraries are not
available.

Issue: #16566
2017-02-03 09:12:06 -05:00
Brad King
4908969f57 FindHDF5: Fix search with HDF5_ROOT
Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching
to correctly find HL for all bindings, 2016-05-12) turned off a large
amount of its logic when HDF5_ROOT is set.  This caused use of the hdf5
compiler wrapper to extract all needed libraries (e.g. z, dl as
dependencies of hdf5 static libraries) to be skipped when using
HDF5_ROOT.

Fix the search logic to honor HDF5_ROOT in all code paths.  Restrict the
search for hdf5-specific components to this root, but allow external
libraries to be found anywhere.

Fixes: #16566
2017-02-03 09:12:05 -05:00
Brad King
77f6d22ad1 FindHDF5: Use keywords in find_library calls
Clarify the purpose of each argument.
2017-02-03 09:12:05 -05:00
Brad King
3d5ad7236c FindHDF5: Initialize/finalize internal search options variable
While at it, use a more private name.
2017-02-03 09:12:05 -05:00
Brad King
ae89967f9d FindHDF5: Fix command-line parsing argument extraction order
Re-implement our internal `_HDF5_parse_compile_line` helper to process
command line arguments all at once and in order.  Otherwise the
libraries named by absolute path and those named by `-l` arguments are
not kept in order.

The new implementation will not handle separate arguments like
`-I /path/to/include/dir` but I have not seen the HDF5 compiler
wrappers produce this form.  If necessary the parsing loop can
be extended with a state variable to keep track of such pairs.
2017-02-03 09:12:04 -05:00
Kitware Robot
6286d26ca6 CMake Nightly Date Stamp 2017-02-03 00:01:05 -05:00
Rolf Eike Beer
37ed860ad1 GNU C++: record that -fvisibility-inlines-hidden is available since 4.0
See https://gcc.gnu.org/onlinedocs/gcc-4.0.0/gcc/Option-Summary.html
2017-02-02 18:28:56 +01:00
Rolf Eike Beer
94a8ee6fd0 GNU C: record that C99 is available since at least 3.4 2017-02-02 18:28:56 +01:00
Rolf Eike Beer
940bf6a4a4 Tests/Module/WCDH: only use -Werror=undef compiler flag if actually supported 2017-02-02 18:28:56 +01:00
Rolf Eike Beer
f26ca5a195 Tests/Module/WCDH: write multi_file_compiler_detection.h before using it
This was broken in commit 98e6d1e5e4
(Tests/Module/WCDH: make it work with only C features defined) when all C tests
were made accessible even if no C++ features are available, but the header was
only created if C++ features are available. Fix it by creating the header
unconditionally before any checks on the available features.
2017-02-02 18:25:28 +01:00
Brad King
2b0256c5ad Merge topic 'find_cuda_fix_typo'
645dd3ca FindCUDA: Fix typo in CUDA_DETECT_INSTALLED_GPUS doc string
2017-02-02 08:55:31 -05:00
Pierre Moreau
645dd3ca53 FindCUDA: Fix typo in CUDA_DETECT_INSTALLED_GPUS doc string 2017-02-02 08:52:11 -05:00
Brad King
3e34049516 Merge topic 'doc-compile-features-fixup'
be3727bf Help: Fix language standard link text in cmake-compile-features(7)
2017-02-02 08:46:33 -05:00
Brad King
be3727bf92 Help: Fix language standard link text in cmake-compile-features(7)
Include each language name in the text of the link to its standards
property.
2017-02-02 08:43:58 -05:00
Brad King
aba66d27a1 Merge topic 'FindGSL-regex-fixup'
88c4576b FindGSL: Fix gl_version.h extraction regex
2017-02-02 08:39:32 -05:00
Christian Pfeiffer
a2a73935b2 FindMPI: Remove leading spaces from flags 2017-02-02 11:31:22 +01:00
Kitware Robot
134ffe9794 CMake Nightly Date Stamp 2017-02-02 00:01:05 -05:00
Igor Peschinskiy
88c4576be4 FindGSL: Fix gl_version.h extraction regex
Fix the regex to match versions with only two digits, such as `2.3`.
2017-02-01 13:47:37 -05:00
Brad King
2d357ea267 Merge branch 'release-3.7' 2017-02-01 13:35:29 -05:00
Brad King
8cdf96d0af Merge branch 'release-3.7' 2017-02-01 13:34:57 -05:00
Christian Pfeiffer
93f29be231 FindMPI: Reset MPI_INCLUDE_PATH_WORK before use 2017-02-01 18:45:13 +01:00
Brad King
6f2e2c74ba Merge topic 'WCDH_allow_unsupported'
1679fecb CompileFeatures Test: make sure the target "CompileFeatures" is always defined
98e6d1e5 Tests/Module/WCDH: make it work with only C features defined
c8703e9d WCDH: optionally omit error code for unknown compilers or compiler versions
0de9c398 WCDH: add macro to write simple replacement defines
2017-02-01 09:21:44 -05:00
Brad King
e8f55c1737 Merge topic 'FortranCInterface-vs-intel-workaround'
c9ee05d8 FortranCInterface: Fix support for VS with Intel toolset
2017-02-01 09:16:25 -05:00
Brad King
2dfe480a9c Merge topic 'intel-c11-windows'
5d70894d Features: Update version of Intel Compiler on Windows supporting C 11
2017-02-01 09:16:22 -05:00
Brad King
d88ab13750 Merge topic 'doc-cmake-packages-typo'
f3619bbc Help: Fix typo in <pkg>_NOT_FOUND_MESSAGE example in cmake-packages(7)
2017-02-01 09:16:20 -05:00
Brad King
048ecde453 Merge topic 'doc-cmake-developer-purpose'
9f3e812f Help: Extend documented purpose of cmake-developer(7) manual
2017-02-01 09:16:17 -05:00
Brad King
d6113e958a Merge topic 'developer-setup'
3288ab0c Convert local hook configuration to a Git config file format
773df0e2 Add pre-commit hook to check whether SetupForDevelopment must re-run
2017-02-01 09:16:14 -05:00
Brad King
9f3e812fac Help: Extend documented purpose of cmake-developer(7) manual
Issue: #16616
2017-02-01 09:09:51 -05:00
Brad King
5d70894d40 Features: Update version of Intel Compiler on Windows supporting C 11
The Intel Compiler 15.0.0 on Windows does not support `-Qstd=c11`.
Bump our version requirement to 16 to use that flag.
2017-02-01 08:55:50 -05:00
Brad King
c9ee05d8d9 FortranCInterface: Fix support for VS with Intel toolset
When using a Visual Studio generator with an Intel toolset, such as

    -T "Intel C++ Compiler XE 14.0"

the generated FortranCInterface mangling detection project may fail to
build due to `devenv` not working with the `/project ALL_BUILD` option.
This seems to be a bug in `devenv` or the Intel VS integration.  Work
around the problem by building with `/project FortranCInterface`
instead.  We only need to build this executable and its dependencies
within the detection test project anyway.

Fixes: #16519
2017-02-01 08:47:42 -05:00
Brad King
f3619bbcd6 Help: Fix typo in <pkg>_NOT_FOUND_MESSAGE example in cmake-packages(7)
Fixes: #16616
2017-02-01 08:40:59 -05:00
Kitware Robot
1f8da86115 CMake Nightly Date Stamp 2017-02-01 00:01:07 -05:00
Brad King
3288ab0c78 Convert local hook configuration to a Git config file format
The `git config` format is cleaner than a bash script and is also
supported by our `hooks` branch to specify CMake-specific hooks.
2017-01-31 11:16:10 -05:00
Brad King
773df0e2d7 Add pre-commit hook to check whether SetupForDevelopment must re-run
Add a version number to the `SetupForDevelopment.sh` script and use
a pre-commit hook to check when it changes.
2017-01-31 11:16:10 -05:00
Brad King
5efb8b9a5d Merge topic 'CSharpVS2017'
435cebaa VS: Fix CSharp compiler identification for VS 2017
2017-01-31 09:04:26 -05:00
Brad King
2e2c92edb0 Merge topic 'FindBoost-cache-unset-on-change'
97d61562 FindBoost: unset cache variables if the lib dir changes
2017-01-31 09:04:23 -05:00
Brad King
6ec0c09a7a Merge topic 'topic-reproducible-build'
5181f1f8 Tests: make tests pass with SOURCE_DATE_EPOCH set
2017-01-31 09:04:21 -05:00
Brad King
5accbaccbc Merge topic 'vs-export-external-objects'
4dde0bc8 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects
2017-01-31 09:04:19 -05:00
Brad King
f012a95836 Merge topic '16432-static-frameworks'
071f8e78 Apple: Add support for static frameworks
d525754e Xcode: Refactor RunCMake.Framework test to prepare for static frameworks
45405f00 Xcode: Ignore Xcode project warning until issue is fixed
50e1c105 Makefile: For static libraries remove only the "real" lib before creating
8643ca75 Makefile: Re-order list of files to clean
2017-01-31 09:04:16 -05:00
Brad King
8a76536e78 Merge topic 'developer-setup'
050bb41c Tell Git not to export the GitSetup directory
d6108c87 GitSetup: Tell Git not to export .gitattributes
3642d657 Merge branch 'upstream-GitSetup' into developer-setup
7e5ef9ca GitSetup 2016-12-13 (cd5ada6d)
a6fda7bf Merge branch 'upstream-GitSetup' into developer-setup
a2d393d6 Add script to update GitSetup from upstream
c7b846ed GitSetup 2012-04-26 (b7daff9b)
2017-01-31 09:04:13 -05:00
Gilles Khouzam
435cebaaa1 VS: Fix CSharp compiler identification for VS 2017
The CSharp compiler for VS 2017 has moved from `MSBuildTools` to
`RoslynTargets`.  Account for both locations giving priority to the
`MSBuildTools` location.
2017-01-31 09:00:20 -05:00
Gregor Jasny
071f8e78dd Apple: Add support for static frameworks
Closes: #16432
2017-01-31 08:59:15 -05:00
Kitware Robot
07d3695e75 CMake Nightly Date Stamp 2017-01-31 00:01:05 -05:00
Brad King
050bb41ca7 Tell Git not to export the GitSetup directory
The `Utilities/GitSetup` directory is useful only in Git work trees
and so does not need to be distributed with source tarballs.
2017-01-30 16:56:31 -05:00
Brad King
d6108c87af GitSetup: Tell Git not to export .gitattributes
GitSetup upstream added an attribute to export `.gitattributes` so that
importing snapshots into the sources of other projects would bring along
the attributes.  However, we don't want to export them from CMake.  Drop
`.gitattributes` entries not relevant to CMake.
2017-01-30 16:53:14 -05:00
Brad King
3642d657b1 Merge branch 'upstream-GitSetup' into developer-setup
* upstream-GitSetup:
  GitSetup 2016-12-13 (cd5ada6d)
2017-01-30 16:45:48 -05:00