Commit Graph

7115 Commits

Author SHA1 Message Date
Daniele E. Domenichelli
9702b3eefd FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twice
Closes: #16582
2017-01-25 10:20:30 +01:00
Brad King
c59d381065 Merge topic 'cpack-stgz-minimal-test'
624709c8 CPack/STGZ: minimalistic packages test
1c93eb68 CPack/STGZ prefer pax for extraction
2017-01-24 14:45:35 -05:00
Brad King
38bb96386c Merge topic 'android-include-api'
1ee0ffab Android: Pass sysroot include directory explicitly
1806e011 Android: Fix c++_{static,shared} support include directory order
2017-01-24 14:45:32 -05:00
Brad King
0e990a01f1 Merge topic 'qt4-lupdate-cmp0058'
1c2ac0b8 Qt4: Only change timestamp on generated .pro files if content changes
2017-01-24 14:45:19 -05:00
Domen Vrankar
1c93eb683b CPack/STGZ prefer pax for extraction
pax is part of POSIX while tar requires
GNU extensions that are not part of some
UNIX distros
2017-01-22 22:06:59 +01:00
Brad King
1ee0ffab81 Android: Pass sysroot include directory explicitly
The NDK's `build/core/definitions.mk` file adds compiler flags:

    -isystem $$(call host-path,$$(SYSROOT_INC)/usr/include)

This passes the system include directory explicitly even though it is
implied by `--sysroot=`.  The explicit flag places the directory
earlier in the include path than the sysroot-default one would be.

Teach CMake to add this include directory at the end of the standard
include path for Android.  Otherwise the toolchain's `include-fixed/`
directory may replace system headers with "fixed" copies that are not
from the same API version.

Closes: #16536
2017-01-20 15:45:09 -05:00
Brad King
1806e011cb Android: Fix c++_{static,shared} support include directory order
The NDK's own build files:

    <ndk>/build/tools/build-cxx-stl.sh
    <ndk>/build/cmake/android.toolchain.cmake

for the `c++_static` and `c++_shared` build types add the
`<ndk>/sources/android/support/include` include directory
between the two `<ndk>/sources/cxx-stl/llvm-libc++*` directories.
Re-order our own include directory generation to match.

Issue: #16536
2017-01-20 15:39:27 -05:00
Clinton Stimpson
1c2ac0b8ba Qt4: Only change timestamp on generated .pro files if content changes
In qt4_create_translation() use file(GENERATE ...) instead of
file(WRITE ...).  This also removes a possible CMP0058 warning
because file(GENERATE) tells the Ninja generator about the files
it provides.

Fixes: #16518
2017-01-20 13:28:48 -05:00
Brad King
6b4b8e6a60 Merge topic 'add-dl-to-lua-static-linking'
adc04afe FindLua: Add dl library to Lua static library linking
2017-01-20 11:54:41 -05:00
Brad King
d9d41d332d Merge topic 'ExternalProject-restore-case-insensitive-hash'
0ed885f7 ExternalProject: Restore case-insensitive download hash check
2017-01-20 11:54:39 -05:00
Brad King
395f01ef72 Merge topic 'cpack-ifw-new-installer-options'
3fc4a2b7 QtIFW: Added new options to QtIFW cpack generator for modifying wizard style
2017-01-20 11:54:34 -05:00
Michael Krasnyk
adc04afe34 FindLua: Add dl library to Lua static library linking
If a Lua library is compiled from source as `liblua.a` its link
dependency on `dl` must be satisfied explicitly.
2017-01-20 11:49:51 -05:00
Brad King
0ed885f742 ExternalProject: Restore case-insensitive download hash check
Refactoring in commit v3.6.0-rc1~47^2 (ExternalProject: Re-implement
download logic as a dedicated script, 2016-05-19) accidentally made the
download hash check case-sensitive.  The hash comparison is done in hex
strings, so restore case-insensitive comparison since the case of the
hex digits does not matter.

Fixes: #16568
2017-01-17 11:45:18 -05:00
Brad King
524c564318 Merge topic 'FindICU-include-dirs'
cdf7e5d8 FindICU: Add 'include' to the path suffixes
2017-01-17 09:05:02 -05:00
Alexander Voitenko
3fc4a2b71a QtIFW: Added new options to QtIFW cpack generator for modifying wizard style 2017-01-17 14:12:02 +03:00
Florent Castelli
cdf7e5d866 FindICU: Add 'include' to the path suffixes
Without this FindICU doesn't recognise the installation within homebrew.
2017-01-16 11:27:02 -05:00
Ben Boeckel
5201a3065b FindHDF5: use the target rather than the path
On Windows, the `LOCATION` property gets the path to the `.dll` rather
than the `.lib` which is unsuitable for linking.
2017-01-16 11:13:48 -05:00
Brad King
47d391d71d Merge topic 'csharp_simple'
397b8546 VS: added documentation for C# support
a7dd8e66 VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015)
6fda6005 VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS
2017-01-16 11:01:29 -05:00
Brad King
743085a579 Merge topic 'cuda_propagate_flags_when_dlink_on_executables'
8d1f9e5b CUDA: Now pass correct FLAGS when device link cuda executables.
dc5051f1 CUDA: Test that CUDA flags are used when device linking executables.
2017-01-16 11:01:17 -05:00
Brad King
034e1723db Merge topic 'clang-3.1-3.3-cpp11'
9fe399e3 Features: activate C++11 support for Clang 3.1+
2017-01-16 11:01:05 -05:00
Michael Stürmer
a7dd8e6692 VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015) 2017-01-13 09:28:13 +01:00
Stephen Sorley
4ae2dcb1b9 CheckFunctionExists: Document suggestion to use CheckSymbolExists instead.
CheckFunctionExists has some severe limitations that are overcome by
CheckSymbolExists.  Document them and suggest the alternative.
2017-01-12 15:52:53 -05:00
Robert Maynard
8d1f9e5b85 CUDA: Now pass correct FLAGS when device link cuda executables.
Previously we had a two issues when building cuda executables
that required separable compilation. The first was that we didn't
propagate FLAGS causing any -arch / -gencode flags to be dropped, and
secondly generators such as ninja would use the CXX language flags
instead of CUDA when the executable was mixed language.
2017-01-12 15:13:36 -05:00
Giel van Schijndel
9fe399e389 Features: activate C++11 support for Clang 3.1+ 2017-01-12 17:16:34 +01:00
Brad King
728820f3ea Merge topic 'cuda-windows'
f9a810f7 CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
5599d858 CUDA: Port test cases to Windows with MSVC host compiler
11551702 CUDA: Populate NVIDIA compiler information on Windows
5365421e CUDA: Detect implicit link information on Windows
522b913f CUDA: Find MSVC binutils on Windows
02582b91 CUDA: Populate compiler PDB placeholder during device linking
d470cb70 CUDA: Use `.obj` object file extension on Windows
a2e80cb0 CUDA: Detect MSVC architecture id
65c1e012 CUDA: Detect use of MSVC host compiler
945dd207 CUDA: Allow platform files to set device linking rules
95420cea CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc
2017-01-12 10:41:57 -05:00
Brad King
1155170230 CUDA: Populate NVIDIA compiler information on Windows
Port Windows-specific compilation and linking rules over from the
`Platform/Windows-MSVC` module and adapt it for NVIDIA CUDA.  On Windows
nvcc and its host compiler (MSVC) do not understand or use options like
`-fPIC` or `-std=`, so condition those out.
2017-01-12 10:39:04 -05:00
Brad King
5365421e84 CUDA: Detect implicit link information on Windows
The `nvcc -v` output on Windows uses response files, so load the one we
need to extract the full link line.
2017-01-12 10:39:03 -05:00
Brad King
522b913f43 CUDA: Find MSVC binutils on Windows
On Windows the host link launcher is just `link.exe`.  Find and use that
instead of trying to extract the launcher from the `nvcc -v` output.
2017-01-12 10:39:03 -05:00
Brad King
d470cb7007 CUDA: Use .obj object file extension on Windows 2017-01-12 10:39:02 -05:00
Brad King
a2e80cb085 CUDA: Detect MSVC architecture id 2017-01-12 10:39:02 -05:00
Brad King
65c1e012ff CUDA: Detect use of MSVC host compiler
Report it in `CMAKE_CUDA_SIMULATE_{ID,VERSION}`.
2017-01-12 10:39:02 -05:00
Brad King
945dd207b6 CUDA: Allow platform files to set device linking rules
Condition the default settings on the rule variables not already being
set.
2017-01-12 10:39:02 -05:00
Brad King
95420cea5e CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc 2017-01-12 10:39:01 -05:00
Brad King
e31986b900 Merge topic 'InstallRequiredSystemLibraries-UCRT-configs'
e0ed1de4 InstallRequiredSystemLibraries: Distinguish UCRT install configurations
2017-01-12 10:21:56 -05:00
Brad King
bc09abd7d0 Merge topic 'get_prerequisites_delayload'
a7c5d5fb GetPrerequisites: Exclude delay load dependencies on Windows
2017-01-12 10:21:30 -05:00
Brad King
b4f7ce5c79 Merge topic 'fix_get_prerequisites'
17a0703d GetPrerequisites: Do not fail on files we cannot find
2017-01-12 10:21:24 -05:00
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