Commit Graph

7279 Commits

Author SHA1 Message Date
Brad King
2e550e36d2 Merge topic 'FindJava-jre-hints'
eb728d26 FindJava: add hints for jre
2017-01-12 10:21:07 -05:00
Brad King
097b47b972 Merge topic 'dont-include-CMakeParseArguments'
d6877e6c Don't include CMakeParseArguments
2017-01-12 10:20:41 -05:00
Brad King
592c8cfd93 Merge topic 'add-cpack-ifw-configure-file'
6310f7c3 Add cpack_ifw_configure_file command
2017-01-12 10:20:33 -05:00
Bjoern Thiel
e0ed1de4fb InstallRequiredSystemLibraries: Distinguish UCRT install configurations
Teach the `CMAKE_INSTALL_UCRT_LIBRARIES` feature to honor the
`CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY` and `CMAKE_INSTALL_DEBUG_LIBRARIES`
settings.

Closes: #16542
2017-01-11 11:20:47 -05:00
Martin Koegler
17a0703d20 GetPrerequisites: Do not fail on files we cannot find
Historically we have always warned and skipped missing files.  Since
commit v3.4.0-rc1~264^2~1 (GetPrerequisites: Add error checks for
execute_process() calls, 2015-07-29) we fail instead, but this was not
an intentional part of that change.  Restore the warn-only behavior so
that missing system libraries (e.g. during cross-compiling) do not cause
failure.

Closes: #16523
2017-01-11 10:57:04 -05:00
Pascal Thomet
a7c5d5fb0e GetPrerequisites: Exclude delay load dependencies on Windows
With some Windows toolchains we use `objdump` which does not mention
delay load dependencies in its output.  Therefore, to get consistent
behavior we should always ignore them.

Use the `dumpbin` message "Image has the following delay load
dependencies" that precedes the delay load dependencies to recognize and
skip them.  Fortunately, this message is not translated to the current
locale (at least on "Windows 7 French", "Windows 10 French" and "Windows
Server 2008 R2 French").

Fixes: #16241
2017-01-11 10:48:36 -05:00
Rechi Rechi
eb728d266e FindJava: add hints for jre 2017-01-11 16:31:01 +01:00
Brad King
9a67022275 Merge topic 'UseSWIG-implicit-depends'
b8968b4b UseSWIG: Automatically scan dependencies of SWIG files for Makefiles
2017-01-11 09:58:52 -05:00
Brad King
474edf75f6 Merge topic 'BundleUtilities-symlink-structure'
b1dc4ddb BundleUtilities: Maintain symlink structure
2017-01-11 09:58:46 -05:00
Brad King
2eb5596503 Merge topic 'Autogen_Simplify'
7db05f42 AUTOGEN: Release notes for SKIP_AUTOX
6eabac26 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC
cbc07d33 AUTOGEN: Documentation for SKIP_AUTOX source file properties
c17e0a3a AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test
53787bf8 AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test
8dbdd3e7 AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test
0699760d AUTOGEN: Generators: Do moc/uic skip test during file list generation
a84f0bb7 AUTOGEN: Generators: Message upper/lower case unification
7b766b83 AUTOGEN: Generators: Use single moc/uic skip test method only
2964b8cc AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages
d58b6bf3 AUTOGEN: Generators: Moc/UicSkipTest methods
94c319f9 AUTOGEN: Generators: Use separate header lists for MOC and UIC
966be439 AUTOGEN: Generators: Be verbose about skipping files
de531432 AUTOGEN: Generators: Remove unused variable
d8e45536 AUTOGEN: Initializer: Always remember skipped files
d9313a82 AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sources
...
2017-01-11 09:58:40 -05:00
Brad King
d1682a8514 Merge topic 'android_clang_asm'
524f5ee1 Android: Set compiler target platform when compiling ASM with Clang
2017-01-11 09:58:37 -05:00
Brad King
445ab80c44 Merge topic 'AndroidTestUtilities-fix-cleanup'
513ef514 AndroidTestUtilities: fix cleanup operation
2017-01-11 09:58:34 -05:00
Brad King
34745595c3 Merge topic 'issue-16513-concrt140-dll'
3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0
2017-01-11 09:58:31 -05:00
Brad King
ff6a034e0b Merge topic 'FindOpenSSL-check-both'
696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present
2017-01-11 09:58:25 -05:00
Brad King
396e9378a8 Merge topic 'pgsql-yum'
5ffee691 FindPostgreSQL: automatically find installations from yum.postgresql.org
2017-01-11 09:58:22 -05:00
Brad King
a8b576244f Merge topic 'FindBoost-1.63'
a9b93501 FindBoost: Add support for 1.63
2017-01-11 09:58:17 -05:00
Brad King
1406408e61 Merge topic 'FindGTest-fixups'
8deb913d FindGTest: add lib search path for MSVC x64 platform
eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value
2017-01-11 09:58:14 -05:00
Brad King
22dfda1112 Merge topic 'FindBoost-find-default'
ff91b151 FindBoost: Search official location of prebuilt binaries on Windows
2017-01-11 09:58:11 -05:00
Daniel Pfeifer
d6877e6c40 Don't include CMakeParseArguments
The cmake_parse_arguments command is builtin with version 3.5.
The CMakeParseArguments module is empty and exists for backwards
compatibility with CMake 3.4 and lower.

Remove the includes of CMakeParseArguments from CMake's modules.
The modules are always used with the current version of CMake.

Leave the includes in the tests, as the tests may be run with an older
version of CMake.
2017-01-11 13:14:57 +01:00
Konstantin Podsvirov
6310f7c3a0 Add cpack_ifw_configure_file command 2017-01-11 13:56:45 +03:00
Alex Turbov
ff91b1514b FindBoost: Search official location of prebuilt binaries on Windows
Make it possible to find Boost in the default install path (`c:\boost`)
of an official prebuilt binaries installation even when `BOOST_ROOT`
has not been specified.
2017-01-10 14:21:53 -05:00
Florent Castelli
524f5ee186 Android: Set compiler target platform when compiling ASM with Clang
Closes: #16535
2017-01-10 14:12:46 -05:00
Harry Mallon
696339a9d5 FindOpenSSL: Check that both CRYPTO and SSL libraries are present
* Strawberry perl on Windows installs one that is found by the
  default finder

While at it, de-duplicate code setting `OPENSSL_LIBRARIES`.
2017-01-10 13:42:48 -05:00
Dong XiaoC
8deb913d98 FindGTest: add lib search path for MSVC x64 platform 2017-01-10 13:26:33 -05:00
Dong XiaoC
eadd395a13 FindGTest: Fix documented GTEST_MSVC_SEARCH default value
Documentation updates in commit v3.5.0-rc1~124^2~2 (FindGTest: Add
imported targets and update documentation, 2015-12-10) accidentally
changed the documented default to the wrong value.  Restore the
documentation to refer to the actual default used in the implementation.
2017-01-10 13:25:59 -05:00
Roger Leigh
a9b93501d4 FindBoost: Add support for 1.63 2017-01-10 13:15:34 -05:00
Ruslan Baratov
513ef514e5 AndroidTestUtilities: fix cleanup operation
`su` is not available by default on all devices:

```
> adb shell "echo ls /data/local/tmp | su"
/system/bin/sh: su: not found
> echo $?
0
```

Also since `execute_adb_command` use `execute_process` under the hood
the pipeline (`|`) will not be treated as special symbol and will be
process just like one more command line argument for the `adb`.
2017-01-10 13:12:45 -05:00
Alexey Sokolov
b8968b4b39 UseSWIG: Automatically scan dependencies of SWIG files for Makefiles
Issue: #4147
2017-01-10 13:05:59 -05:00
Martin Koegler
b1dc4ddbdd BundleUtilities: Maintain symlink structure
Closes: #15047
2017-01-10 10:55:41 -05:00
Rolf Eike Beer
5ffee691ee FindPostgreSQL: automatically find installations from yum.postgresql.org
In commit v3.3.0-rc1~4^2 (FindPostgreSQL: Search some more common
packaging locations) the PostgreSQL_ADDITIONAL_SEARCH_PATHS variable was
removed. This was used e.g. by osm2pgsql to be able to build on CentOS
with recent PostgreSQL versions. At least add those locations from
yum.postgresql.org, which is a more or less official location.
2017-01-10 09:52:42 -05:00
Brad King
ea62999f45 Merge topic 'cpack-rpm-user-binary-spec-file-fix'
574c81e2 CPack/RPM fix - custom binary spec file handling
2017-01-10 09:34:46 -05:00
Sebastian Holtermann
e7280a7f17 AUTOGEN: Rename config variables
The new names describe the variables use cases better.
2017-01-10 12:49:15 +01:00
Domen Vrankar
574c81e28c CPack/RPM fix - custom binary spec file handling
Fixes #16507
2017-01-10 08:37:14 +01:00
Brad King
eee51e24d2 Merge topic 'cpack-deb-package-version-override-fix'
2f4e5ed6 CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION
2017-01-09 16:27:31 -05:00
Daniel Pfeifer
2f4e5ed66d CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION 2016-12-20 14:09:20 +01:00
Taylor Braun-Jones
3578e86272 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0
Fixes #16513
2016-12-16 18:02:48 -05:00
Daniel Carrera
4087d0ae85 PGI: Add support for Fortran with the Ninja generator
The PGI documentation says that `-Mpreprocess` "instructs the compiler
to perform cpp-like preprocessing on assembly and Fortran input source
files".  The `-E` flag causes the compiler to spit the result to stdout
instead of saving it to a file.
2016-12-16 08:33:21 -05:00
Brad King
0a9e4e08b5 Merge topic 'FindGit-fix-cross-compile'
caeb6d1d FindGit: Fix check for Windows host
2016-12-16 08:26:23 -05:00
Brad King
58dc3745ec Merge topic 'FindPythonLibs-tolerate-components'
a12d8a03 FindPythonLibs: Tolerate call with PYTHON_LIBRARY already a list
2016-12-16 08:26:16 -05:00
Brad King
4a06479874 Merge topic 'csharp_support_compiler_detection'
5c6c0344 C# support: add compiler detection for MSVC
2016-12-16 08:26:06 -05:00
José Simões
caeb6d1dfb FindGit: Fix check for Windows host
When cross-compiling to or from a Windows platform we should still
find a Git for the host environment.
2016-12-15 09:57:30 -05:00
Maxime Morel
9fdad82c48 FindPNG: Fix small typo fix in module help 2016-12-15 09:38:51 -05:00
Francois Budin
a12d8a03af FindPythonLibs: Tolerate call with PYTHON_LIBRARY already a list
`PYTHON_LIBRARY` may contain a list because of `SelectLibraryConfigurations`.
If it is the case, the list can be:

    optimized;<FILEPATH_TO_RELEASE_LIBRARY>;debug;<FILEPATH_TO_DEBUG_LIBRARY>

Instead of directly using the value of `PYTHON_LIBRARY` in the CMake
function `get_filename_component()`, we loop over the content of the
relevant parts of `PYTHON_LIBRARY` and `PYTHON_DEBUG_LIBRARY` whether
they are lists or not.

Suggested-by: Brad King <brad.king@kitware.com>
2016-12-15 09:34:48 -05:00
Michael Stürmer
5c6c0344d3 C# support: add compiler detection for MSVC 2016-12-15 09:16:30 -05:00
Brad King
858081c2f9 Merge topic 'cuda-implicit-libs'
e3f404fe CUDA: Implement nvcc implicit link line extraction more robustly
2016-12-14 09:52:08 -05:00
Brad King
2674818ee1 Merge topic 'GNUInstallDirs-cache-type'
53b5d634 GNUInstallDirs: Set UNINITALIZED cache properties to type PATH
c968213d GNUInstallDirs: Unify path logic into helper macros
2016-12-14 09:51:59 -05:00
Brad King
e3f404fe29 CUDA: Implement nvcc implicit link line extraction more robustly
Do not assume that the implicit link line is the last line of the output
from `nvcc -v`.  Instead first find the `LIBRARIES=` line, and then look
for that content on a later line.  It appears twice.  First on a call to
`nvlink`, which we ignore.  Later it appears on the implicit link line.
Extract the latter line.  On failure, abort with a `FATAL_ERROR` so that
the user does not try to build without proper link information.

Once we have the line, parse it with `separate_arguments` using the
`UNIX_COMMAND` option just like `CMakeParseImplicitLinkInfo` already
does.  This robustly parses the command line and removes quoting.
Then extract the first argument as the host link launcher.
2016-12-13 11:01:40 -05:00
Brad King
c241679956 Merge topic 'GetPrerequisites-fix-find_program-call'
1d1f29f4 GetPrerequisites: Fix call to find_program for `ri` tool
2016-12-13 08:45:50 -05:00
Roger Leigh
53b5d6345d GNUInstallDirs: Set UNINITALIZED cache properties to type PATH
Also convert the path to a cmake path
2016-12-12 22:23:26 +00:00
Roger Leigh
c968213d2e GNUInstallDirs: Unify path logic into helper macros
- Unify path handling: Rather than repeat the same logic for each
  individual path create two macros which can be used throughout
  the module.
- Capitalise helpstrings to match the conventions used by the
  standard CMake properties
2016-12-12 22:22:44 +00:00