Commit Graph

7794 Commits

Author SHA1 Message Date
Steffen Dettmer
d4e551a90b FindThreads: Drop try_run to improve cross-compiling support
Use `try_compile` instead of `try_run`.  It is not clear why `try_run`
was ever needed, and it does not work during cross-compiling.

Update the check's source file to remove code associated with actually
running things.  Also remove the ancient `__CLASSIC_C__` code path and
use a simple `int main(void)` as in `Modules/CheckIncludeFile.c.in`.

Fixes: #16920
2017-08-30 11:15:26 -04:00
Brad King
55e281c3b7 Merge topic 'cpackifw-repositories-directories'
5fe64511 CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1150
2017-08-28 09:53:10 -04:00
Brad King
39889d778e Merge topic 'FindQt4-do-not-assume-all-libraries-are-frameworks'
33161f48 FindQt4: Do not assume all libraries are frameworks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1169
2017-08-28 09:52:27 -04:00
Albert Ziegenhagel
f362052b81 GNUToMS: Tolerate existence of a %USERPROFILE%/source directory
The VS environment script we load changes the working directory to
`%USERPROFILE%/source` if it exists.  Set `VSCMD_START_DIR` to tell
the script to retain the current working directory.
2017-08-25 14:24:24 -04:00
Brad King
a749fcb3d0 Merge topic 'modernize-git-whitespace-attributes'
8ed03baa gitattributes: prefer `eol=crlf` to `-crlf`
40470031 MumpsCoverage: remove unnecessary attribute
d20485d8 gitattributes: prefer `eol=lf` to `crlf=input`
b85c2589 gitattributes: prefer `-text` for binary files
377f3685 gitattributes: remove unused attributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1173
2017-08-25 11:04:05 -04:00
Brad King
229c37a54b Merge topic 'ninja-cl-intl'
de9840d1 Ninja: Fix support for MSVC with non-English output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1179
2017-08-24 09:35:01 -04:00
Brad King
65ca67cef1 Merge topic 'boost-1.65'
fa114e7d FindBoost: Add Boost 1.65 dependencies
e66e8e89 BoostScanDeps: Special case python and numpy and variants

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1172
2017-08-24 09:34:22 -04:00
Brad King
94299c496d Merge topic 'ninja-gfortran-fpreprocessed'
90a34ff7 Ninja: Fix references to source files in gfortran diagnostics

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1146
2017-08-24 09:33:55 -04:00
Raul Laasner
90a34ff791 Ninja: Fix references to source files in gfortran diagnostics
The Ninja generator preprocesses and compiles separately for Fortran.
When compiling, tell gfortran that the source is already preprocessed so
that it will honor the `# <line>` directives when producing diagnostics
messages.

Fixes: #17160
2017-08-23 15:32:44 -04:00
Ben Boeckel
8ed03baa76 gitattributes: prefer eol=crlf to -crlf
The `crlf` attribute is deprecated in Git. This also changes the given
files to be in the index using LF newlines, but they will be checked
out with CRLF newlines due to the attribute.
2017-08-23 13:31:41 -04:00
Brad King
de9840d1b8 Ninja: Fix support for MSVC with non-English output
With MSVC the Ninja generator extracts the `cl -showIncludes` prefix.
When MSVC is configured to have non-English output, e.g. via
`VSLANG=2052` in the environment, then `cl` prints the prefix encoded
for the current code page, which is not necessarily UTF-8 encoding.
Currently we fail to convert the prefix to our internal UTF-8 encoding,
but assume it is UTF-8 later.

While writing `rules.ninja`, the Ninja generator converts our internal
UTF-8 encoding to the current code page.  The `msvc_deps_prefix =` line
needs to be encoded as the current code page so that `ninja` can match
in the output from `cl -showIncludes` during the build.

Prior to commit v3.9.0-rc1~47^2 (codecvt: Re-implement do_out and
do_unshift, 2017-05-25), the non-UTF-8 prefix extracted above was
written without noticing its incorrect internal encoding.  The
`rules.ninja` file was successfully written, but possibly with a mangled
`msvc_deps_prefix`.  Since that commit the output stream correctly
rejects the non-UTF-8 byte sequence and writing `rules.ninja` fails.

Fix this by correctly converting the `cl -showIncludes` output from the
current code page to our internal UTF-8 encoding.

Fixes: #17191
2017-08-23 11:10:41 -04:00
Brad King
fa664d9863 Merge topic 'FindCurses-wide'
72343d26 Help: Add notes for topic 'FindCurses-wide'
4b02afc0 FindCurses: Add option for ncursesw detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1161
2017-08-23 09:03:58 -04:00
Roger Leigh
fa114e7d70 FindBoost: Add Boost 1.65 dependencies 2017-08-22 17:03:36 +01:00
Sebastian Holtermann
cf7b3b9671 Autogen: Initializer optimizations and cleanups 2017-08-22 17:13:59 +02:00
Alexandr (Sagrer) Gridnev
4b02afc0ca FindCurses: Add option for ncursesw detection
This is a remake of the patch from issue #10347 but based on current
master. Works for me on Lubuntu 17.04.

Fixes: #10347
2017-08-22 10:42:20 -04:00
Brad King
6b37d69cdb Merge topic 'cmake-ice37-2'
d0a20d29 FindIce: Add support for separate Freeze NuGet package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1152
2017-08-22 08:26:44 -04:00
Brad King
86a5b97fe8 Merge topic 'InstallRequiredSystemLibraries-vs15.3'
23cf9e15 InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directory
b45d8432 InstallRequiredSystemLibraries: Factor redist name into variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1168
2017-08-22 08:24:14 -04:00
Brad King
d3d0191dcd Merge topic 'revert-macos-hidpi-qt-dialog'
286c75f7 macOS: Revert default Hi-DPI support in applications

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1167
2017-08-22 08:21:03 -04:00
Brad King
286c75f7f0 macOS: Revert default Hi-DPI support in applications
This reverts commit v3.9.0-rc1~287^2 (macOS: Enable Hi-DPI support in
applications by default, 2017-04-08).  It breaks iOS applications that
do not use their own `MACOSX_BUNDLE_INFO_PLIST` because `NSApplication`
is only for macOS apps.  Until more complete support for iOS is added
to CMake (e.g. with a different default plist file) we must allow
our default plist file to work for both macOS and iOS.

Fixes: #17179
2017-08-22 07:29:20 -04:00
Jean-Christophe Fillion-Robin
33161f489c FindQt4: Do not assume all libraries are frameworks
Since on MacOSX not all modules are available as "framework" (e.g libQtUiTools.a),
the assumption made in "FindQt4.cmake" is not always valid and systematically
setting the imported libraries location to framework location is incorrect.

This commit increases the robustness of the logic by first checking
if the location exists.

Fixes #17195
2017-08-21 16:18:49 -04:00
Brad King
23cf9e152f InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directory
Add compiler version 19.11 to our table.

Fixes: #17184
2017-08-21 11:59:33 -04:00
Brad King
b45d8432c2 InstallRequiredSystemLibraries: Factor redist name into variable
Store the `VC###` component of the `Microsoft.VC###.CRT` directory name
in a variable set based on the toolchain version.  Its naming convention
is changed by VS 15.3.
2017-08-21 11:59:31 -04:00
Brad King
ab5667b516 Merge topic 'autogen-macro-names'
b3d98c6e Autogen: Add release notes for AUTOMOC_MACRO_NAMES
7529d84f Autogen: Add documentation for AUTOMOC_MACRO_NAMES
05891d8f Autogen: Add test for AUTOMOC_MACRO_NAMES
93f0ba28 Autogen: Add AUTOMOC_MACRO_NAMES support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1156
2017-08-21 09:02:09 -04:00
Brad King
037beeddd1 Merge topic 'findcuda_dont_quote_COMPILE_DEFINITIONS'
c1f4f13d FindCUDA: Use long brackets to handle spaces in CUDA_NVCC_COMPILE_DEFINITIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1139
2017-08-21 08:56:56 -04:00
Sebastian Holtermann
93f0ba2823 Autogen: Add AUTOMOC_MACRO_NAMES support
Closes #17176
2017-08-18 12:32:04 +02:00
Roger Leigh
d0a20d290c FindIce: Add support for separate Freeze NuGet package 2017-08-17 20:59:09 +01:00
Konstantin Podsvirov
5fe64511d6 CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable
Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable to specify
additional repositories dirs that will be used to resolve and
repack dependent components
2017-08-17 21:41:16 +03:00
Brad King
f59d8e5982 Merge topic 'CPackRPM-new-debuginfo'
48fa4c0d CPackRPM: Restore old style debuginfo creation for rpm >= 4.14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1099
2017-08-16 11:05:12 -04:00
Brad King
75b3866a8e Merge topic 'ice-3.7.0'
5868be86 FindIce: Add support for Ice 3.7.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1137
2017-08-16 10:50:22 -04:00
Brad King
b034e22f36 Merge topic 'FindCygwin-fix-regression'
a428b87c Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regression
62930253 FindCygwin: Fix regression when CYGWIN_INSTALL_PATH is already set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1128
2017-08-16 10:47:38 -04:00
Brad King
867b061153 Merge topic 'debian_clang_binutils'
630235bd Clang: Find version-suffixed LLVM/Clang binutils

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1127
2017-08-16 10:47:10 -04:00
Brad King
472acc890f Merge topic 'cuda-device-link-ccbin'
fe45d13a CUDA: Pass host compiler to nvcc while device linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1138
2017-08-16 10:46:42 -04:00
Björn Esser
48fa4c0d1a CPackRPM: Restore old style debuginfo creation for rpm >= 4.14 2017-08-16 11:21:37 +02:00
Sylvain Joubert
630235bd9e Clang: Find version-suffixed LLVM/Clang binutils
Debian renames all LLVM/Clang binaries with a version suffix to allow
multiple versions to be installed at the same time.  While there is a
version-agnostic package that adds a symlink to provide the standard
binary names, if only the versioned packages are installed, binaries
must be found as `binary-x.y`.  In any case, using the same version of
the `binutils` as the compiler seems better.
2017-08-15 14:51:44 -04:00
Maikel van den Hurk
fe45d13a0e CUDA: Pass host compiler to nvcc while device linking 2017-08-15 14:46:11 -04:00
Brad King
a428b87ccf Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regression 2017-08-15 13:55:54 -04:00
Tibor Szabo
62930253a3 FindCygwin: Fix regression when CYGWIN_INSTALL_PATH is already set
The change in commit v3.9.0-rc1~54^2 (FindCygwin: Use find_program
instead of find_path, 2017-05-18) broke cases when `CYGWIN_INSTALL_PATH`
is already set, e.g. on the command-line or by an earlier call to
`find_package(Cygwin)`.  Since `find_program` now finds the actual
`cygwin.bat` file, use a separate cache entry to save the location
and then compute `CYGWIN_INSTALL_PATH`.  If `CYGWIN_INSTALL_PATH`
is already set, use that to avoid `find_program` having to search.
2017-08-15 13:53:10 -04:00
Brad King
8ebd590b21 Merge topic 'cpack-deb-ipk'
a17ef574 CPackDeb: Loosen filename requirement to allow for .ipk

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1093
2017-08-15 13:19:53 -04:00
Brad King
8fb9a5770a Merge topic 'cpackifw-package-file-extension'
45623e72 CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !1117
2017-08-15 13:08:26 -04:00
Robert Maynard
c1f4f13dbf FindCUDA: Use long brackets to handle spaces in CUDA_NVCC_COMPILE_DEFINITIONS
Fixes #16510. Quoting of compile definitions breaks string value definitions
2017-08-15 12:58:52 -04:00
Nils Gladitz
a17ef5748a CPackDeb: Loosen filename requirement to allow for .ipk
The OPKG packaging system uses deb like package files with
an .ipk extension. Allow the DEB generator to be used in that context.
2017-08-12 17:27:06 +02:00
Domen Vrankar
d2c9efa947 CPack: additional CPACK_COMPONENTS_ALL documentation 2017-08-12 10:54:27 +02:00
Roger Leigh
5868be8677 FindIce: Add support for Ice 3.7.0
- Search for NuGet packages on Windows, which is the new way the
  official binary builds are distributed for 3.7.0
- Search for C++11 versions of libraries, with "++11" suffix,
  taking Windows naming inconsistencies into account (Windows
  libraries have a "37" suffix, but this is placed /before/
  the "++11".
- Add new Ice 3.7 programs
- Document new Ice 3.7 components
- Add debug output for search suffixes
- Simplify debug logic
2017-08-12 01:12:46 +01:00
Brad King
d4b70a20fa Merge topic 'FindCUDA-superseded'
ae813b6b FindCUDA: Document that module has been superseded

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1124
2017-08-11 09:12:37 -04:00
Brad King
485cbd456a Merge topic 'findcuda_dont_ignore_CUDA_USE_STATIC_CUDA_RUNTIME'
d9c8aa47 FindCUDA: Always obey the CUDA_USE_STATIC_CUDA_RUNTIME option.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1123
2017-08-11 09:12:18 -04:00
Boris Fomitchev
cbf1393aa4 FindCUDA: Add CUDA9/Volta recognition 2017-08-10 11:10:07 -04:00
Brad King
ae813b6bcc FindCUDA: Document that module has been superseded
Add a note at the top of the module documentation to point readers
at the first-class support for the CUDA language.
2017-08-10 10:22:53 -04:00
Robert Maynard
d9c8aa47c2 FindCUDA: Always obey the CUDA_USE_STATIC_CUDA_RUNTIME option.
Fixes #17150, where the FindCUDA would incorrectly handle
CUDA_USE_STATIC_CUDA_RUNTIME being set to false.
2017-08-10 09:33:06 -04:00
Konstantin Podsvirov
45623e7255 CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable
Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable to customize
target binary format.
2017-08-10 00:20:11 +03:00
Brad King
db6ea482f6 Merge topic 'gtest-dynamic-discovery'
bfcda401 Add dynamic test discovery for for Google Test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1056
2017-08-08 09:29:48 -04:00