Commit Graph

34110 Commits

Author SHA1 Message Date
caryoscelus
62c4cb4b6f UseSWIG: Record generated java files as custom command outputs
When another target depends on the generated files CMake must know which
custom command generates them in order to hook up the dependency
properly.  We already do this for Python.  Add the Java files too.
2016-11-29 10:21:05 -05:00
Harry Mallon
f7c2a803a8 CMakeGraphVizOptions: Minor improvements to docs.
* Add `GRAPHVIZ_GRAPH_TYPE` options.
* Correct inaccurate usage info.
2016-11-29 10:05:02 -05:00
Michael Stürmer
e390991846 VS: Add option to customize vcxproj user props file
Add a `VS_USER_PROPS_CXX` target property to set the user props file of
the generated `.vcxproj` file to be something other than the default
`$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props`.
2016-11-29 09:31:30 -05:00
Brad King
44c978a2da Merge branch 'release' 2016-11-29 09:02:07 -05:00
Brad King
325e452ea2 Merge topic 'find-module-cleanup-sweep'
745b56f5 Find*.cmake: drop the comments before including FPHSA
0ab9cb46 FindLibArchive: do not set LibArchive_FOUND explicitly
703d1943 FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSA
2016-11-29 08:59:20 -05:00
Brad King
9e8f74fbb0 Merge topic 'FindDevIL-updates'
7abb12c8 FindDevIL: Make the ILUT library optional
d3f9f512 FindDevIL: fail properly when library is not found.
2016-11-29 08:59:17 -05:00
Brad King
2ee5eac366 Merge topic 'FindPkgConfig-fix-print-errors'
cbccebba FindPkgConfig: Fix missing error text when library version is specified
2016-11-29 08:59:14 -05:00
Brad King
839cd16396 Merge topic 'vs-default-build-package'
9e3164df VS: Add option to place `PACKAGE` target in solution default build
2016-11-29 08:59:11 -05:00
Brad King
2f7bafd6da Merge topic 'try_compile-honor-CMAKE_WARN_DEPRECATED'
6d604c49 try_compile: Honor CMAKE_WARN_DEPRECATED in test project
2016-11-29 08:59:07 -05:00
Brad King
4838ca14df Merge topic 'initial_cuda_language_support'
4cc601f2 Help: Add release note for CUDA support
7b9131da CUDA: Add tests to verify CUDA compiler works properly.
9cf5b98d CUDA: Prefer environment variables CUDACXX and CUDAHOSTCXX.
a5e806b3 CUDA: Add support for CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITY
d038559e CUDA: Add separable compilation support to the makefile generator.
43ce4414 CUDA: Add separable compilation support to the ninja generator.
4b316097 CUDA: Add support for the CUDA_SEPARABLE_COMPILATION target property
ae05fcc6 CUDA: Add LinkLineComputer that computes cuda dlink lines.
115269a8 CUDA: Refactor cmLinkLineComputer to allow for better derived children.
5dec4031 CUDA: Refactor CMakeCUDAInformation to prepare for separable compilation.
5b20d0ab CUDA: C++ compile features now enable cuda c++11 support.
489c52ce CUDA: Use the host compiler for linking CUDA executables and shared libs.
bbaf2434 CUDA: add support for specifying an explicit host compiler.
a92f8d96 CUDA: Enable header dependency scanning.
ec6ce623 CUDA: State that cuda has preprocessor output and can generate assembly.
4f5155f6 CUDA: We now properly perform CUDA compiler identification.
...
2016-11-29 08:59:03 -05:00
Brad King
a0af10e423 Merge topic 'librhash-left-shift-unsigned'
9e07ffa4 librhash: Avoid signed left-shift overflow in sha256
2016-11-29 08:58:59 -05:00
Brad King
dd4e25a5a6 Merge topic 'libarchive-openssl-1.1'
6f23daea libarchive: Add support for building with OpenSSL 1.1
7d433206 libarchive: Add headers to adapt between OpenSSL 1.1 and older versions
2016-11-29 08:58:55 -05:00
Michael Stürmer
9e3164dfa2 VS: Add option to place PACKAGE target in solution default build
Add a `CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD` variable to control
this behavior.
2016-11-29 08:46:27 -05:00
Brad King
9e07ffa4e4 librhash: Avoid signed left-shift overflow in sha256
Fix `rhash_sha256_final` to use unsigned integers for left shifting to
avoid the possibility of undefined overflow behavior.
2016-11-29 08:30:25 -05:00
Kitware Robot
2f7e05fbc2 CMake Nightly Date Stamp 2016-11-29 00:01:04 -05:00
Rolf Eike Beer
745b56f58c Find*.cmake: drop the comments before including FPHSA
No need to explain this over and over again.  While at it, do some other
minor cleanups to whitespace and comments (i.e. delete them).
2016-11-28 16:40:13 -05:00
Rolf Eike Beer
0ab9cb4699 FindLibArchive: do not set LibArchive_FOUND explicitly
FPHSA already does this.
2016-11-28 16:39:24 -05:00
Rolf Eike Beer
703d194338 FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSA
The version of CMake required to build CMake is now new enough to have
that variable.
2016-11-28 16:38:42 -05:00
Vladimír Vondruš
7abb12c826 FindDevIL: Make the ILUT library optional
Some distributions (such as ArchLinux) have only the IL and ILU
libraries and since these are mainly used, the module should succeed
even though ILUT was not found.  Removed it from the FPHSA() macro call,
making it effectively optional.
2016-11-28 16:31:25 -05:00
Vladimír Vondruš
d3f9f5120c FindDevIL: fail properly when library is not found.
Due to a mismatch between module name and name passed to FPHSA() the
macro printed an error message but the error was not caught up by CMake.
Fix the typo.
2016-11-28 16:31:04 -05:00
Gautier Pelloux-Prayer
cbccebbac9 FindPkgConfig: Fix missing error text when library version is specified
Calls like `pkg_check_modules(somelibrary>=3.22)` that specify a version
requirement should still display an informative error when the package
is not found.  Fix our logic accordingly.
2016-11-28 16:18:07 -05:00
Brad King
a04bbcde3d Merge branch 'libarchive-openssl-1.1' into release 2016-11-28 14:55:48 -05:00
Brad King
6f23daea43 libarchive: Add support for building with OpenSSL 1.1
OpenSSL 1.1 made some CTX structures opaque.  Port our code to use the
structures only through pointers via OpenSSL 1.1 APIs.  Use our adaption
layer to make this work with OpenSSL 1.0 and below.

Patch-by: Tomas Mraz <tmraz@redhat.com>
Patch-from: https://bugzilla.redhat.com/1383744
2016-11-28 14:55:42 -05:00
Brad King
7d433206cf libarchive: Add headers to adapt between OpenSSL 1.1 and older versions
Add private forwarding headers for `openssl/{evp,hmac}.h` to give us a
central place to add adaptation code to work across multiple
incompatible OpenSSL versions.  Provide compatibility implementations of
some OpenSSL 1.1 APIs when using older OpenSSL versions.
2016-11-28 14:55:42 -05:00
Brad King
4093bd4025 Merge topic 'include-what-you-use'
d0c14dfb avoid including cmStandardIncludes.h
66a70999 iwyu: Fix VisualStudio specific issues
7b4244ac iwyu: Fix more findings
aeff60e4 iwyu: Fix OSX specific issues
2016-11-28 14:24:07 -05:00
Brad King
56c5c8e17a Merge topic 'cpack-tests-framework-updates'
50c3ebb9 Tests: CPack test documentation facelift
a8a47098 Tests: CPack/DEB test change prerequirements check
48456535 Tests: source CPack tests don't require build stage
d040d164 Tests: CPack test set packaging type
2cc479bd Tests: remove generator prefix from CPack test name
181e9bb6 Tests: CPack test long_filenames prerequirements
b687d2ba Tests: CPack test use same content list
ed8858ed Tests: CPack test unify expected file naming
8575affa Tests: CPack test move and merge VerifyResult
79443e1b Tests: CPack test move per test prerequirements
6d51bea4 Tests: CPack test merge generator specifics
0f15aee7 Tests: CPack test move ExpectedFiles script
a0ad6fc4 Tests: CPack test should always check test output
46b6a25a Tests: CPack test move std error files to test files
53a69c7d Tests: CPack move tests to separate dir
70b52a71 Tests: CPack test should use default package name
...
2016-11-28 14:23:29 -05:00
Brad King
8a975efc94 Merge topic '16449-revert-xcode-system-includes'
543dcb0a Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"
2016-11-28 14:23:21 -05:00
Daniel Pfeifer
d0c14dfb36 avoid including cmStandardIncludes.h 2016-11-28 14:06:41 -05:00
Daniel Pfeifer
66a7099993 iwyu: Fix VisualStudio specific issues 2016-11-28 14:06:40 -05:00
Daniel Pfeifer
7b4244aceb iwyu: Fix more findings 2016-11-28 14:06:40 -05:00
Brad King
ca7a52fc59 Merge branch '16449-revert-xcode-system-includes' into release 2016-11-28 13:57:56 -05:00
Gregor Jasny
543dcb0ada Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"
Revert commit v3.7.0-rc1~266^2 (Xcode: Obey SYSTEM keyword for includes,
2015-08-31).  It worked for C, C++, and Swift but not for GNU Assembly
files for which Xcode has no property to set flags.

Closes: #16449
2016-11-28 13:42:46 -05:00
Brad King
9db0dfd758 FindPythonLibs: Tolerate a non-absolute PYTHON_EXECUTABLE
The `PYTHON_EXECUTABLE` variable normally contains an absolute path, but
tolerate cases when it does not without calling `get_filename_component`
with an incorrect number of arguments.

Closes: #16452
2016-11-28 12:49:02 -05:00
Kitware Robot
1b22cb0a07 CMake Nightly Date Stamp 2016-11-28 00:01:05 -05:00
Domen Vrankar
50c3ebb903 Tests: CPack test documentation facelift 2016-11-27 23:20:35 +01:00
Domen Vrankar
a8a4709808 Tests: CPack/DEB test change prerequirements check
Prerequirements should be searched for in
generator prerequirements function and only
checked for presence in configure file in
per test prerequirements function.
2016-11-27 23:20:35 +01:00
Domen Vrankar
48456535f3 Tests: source CPack tests don't require build stage 2016-11-27 23:20:35 +01:00
Domen Vrankar
d040d1647d Tests: CPack test set packaging type
CPack tests can now define one or more
packaging types and that test will be
executed once per generator per packaging
type. This also enables us to set default
values per packaging type for each generator
which makes tests shorter.
2016-11-27 23:20:35 +01:00
Domen Vrankar
2cc479bdac Tests: remove generator prefix from CPack test name 2016-11-27 23:20:35 +01:00
Domen Vrankar
181e9bb612 Tests: CPack test long_filenames prerequirements
Fakeroot executable is already searched
for in DEB packager tests prerequirements
so the test prerequirement just has to
check that it is present in config file
and not search for it once more.
2016-11-27 23:20:35 +01:00
Domen Vrankar
b687d2ba09 Tests: CPack test use same content list
Content list for a certain test
should be the same between different
generators so whenever possible use
a single expected files list per
file for all generators.
2016-11-27 23:20:35 +01:00
Domen Vrankar
ed8858edb7 Tests: CPack test unify expected file naming
Each generator generates its own file
format with different extensions but
they all create those file names by
a certain pattern and all of them
require the same pieces for that pattern
to work. Now we can only provide pieces
once and and each generator will use those
pieces to generate an expected file name.
2016-11-27 23:20:35 +01:00
Domen Vrankar
8575affa4c Tests: CPack test move and merge VerifyResult
Merge VerifyResult of different generators
pertest and move the file to its test dir.
2016-11-27 23:20:35 +01:00
Domen Vrankar
79443e1b8b Tests: CPack test move per test prerequirements
Move per test prerequirements into the
belonging test.
2016-11-27 23:20:35 +01:00
Domen Vrankar
6d51bea4e6 Tests: CPack test merge generator specifics
Merge test generator specifics into
test itself.
2016-11-27 23:20:35 +01:00
Domen Vrankar
0f15aee799 Tests: CPack test move ExpectedFiles script
Merge per generator ExpectedFiles scripts
into one per test and move it to test dir.
2016-11-27 23:20:35 +01:00
Domen Vrankar
a0ad6fc4dc Tests: CPack test should always check test output 2016-11-27 23:20:35 +01:00
Domen Vrankar
46b6a25ada Tests: CPack test move std error files to test files 2016-11-27 23:20:35 +01:00
Domen Vrankar
53a69c7dd4 Tests: CPack move tests to separate dir
For greater transparency tests
are moved to a subfolder with
each test having its own dir.
2016-11-27 23:20:34 +01:00
Domen Vrankar
70b52a7113 Tests: CPack test should use default package name
Package names are irrelevant for most
CPack tests so tests now set default
package name that is created from test
name and used if it is not explicitly
provided in the test.
2016-11-27 23:20:34 +01:00