summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'UseSWIG-java-outputs'Brad King2016-11-301-3/+4
|\ | | | | | | | | 62c4cb4b UseSWIG: Record generated java files as custom command outputs
| * UseSWIG: Record generated java files as custom command outputscaryoscelus2016-11-291-3/+4
| | | | | | | | | | | | 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.
* | Merge topic 'update-kwsys'Brad King2016-11-302-33/+53
|\ \ | | | | | | | | | | | | | | | 8bced8b1 Merge branch 'upstream-KWSys' into update-kwsys cd5cff13 KWSys 2016-11-28 (1c7c2139)
| * \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-11-292-33/+53
| |\ \ | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-11-28 (1c7c2139)
| | * | KWSys 2016-11-28 (1c7c2139)KWSys Upstream2016-11-292-33/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 1c7c2139e773124c0a2b80e10b2840c22a750980 (master). Upstream Shortlog ----------------- Brad King (2): 5e556d53 Refactor CMake policy settings cb55cf5a Set CMake Policy CMP0063 to NEW within KWSys Dāvis Mosāns (1): 1c7c2139 ConsoleBuf: Fix character handling between buffer boundaries
* | | | Merge topic 'vs15-rename-generator-for-master'Brad King2016-11-305-15/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 31e013ae Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master d639620e VS: Rename VS 15 generator to 'Visual Studio 15 2017'
| * \ \ \ Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-masterBrad King2016-11-295-15/+18
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | VS: Rename VS 15 generator to 'Visual Studio 15 2017'Roman Wüger2016-11-295-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The final name of this VS version was announced: https://blogs.msdn.microsoft.com/visualstudio/2016/11/16/visual-studio-2017-rc/ Add the year to the generator name accordingly. For convenience, map the name without the year to the name with the year.
* | | | | CMake Nightly Date StampKitware Robot2016-11-301-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release'Brad King2016-11-290-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'libarchive-openssl-1.1' into releaseBrad King2016-11-289-41/+183
| |\ \ \ \
| * \ \ \ \ Merge branch '16449-revert-xcode-system-includes' into releaseBrad King2016-11-283-44/+19
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'find-module-cleanup-sweep'Brad King2016-11-2948-111/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Find*.cmake: drop the comments before including FPHSARolf Eike Beer2016-11-2848-106/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | | | | FindLibArchive: do not set LibArchive_FOUND explicitlyRolf Eike Beer2016-11-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FPHSA already does this.
| * | | | | | | FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSARolf Eike Beer2016-11-281-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version of CMake required to build CMake is now new enough to have that variable.
* | | | | | | | Merge topic 'FindDevIL-updates'Brad King2016-11-291-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7abb12c8 FindDevIL: Make the ILUT library optional d3f9f512 FindDevIL: fail properly when library is not found.
| * | | | | | | | FindDevIL: Make the ILUT library optionalVladimír Vondruš2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | FindDevIL: fail properly when library is not found.Vladimír Vondruš2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge topic 'FindPkgConfig-fix-print-errors'Brad King2016-11-291-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbccebba FindPkgConfig: Fix missing error text when library version is specified
| * | | | | | | | | FindPkgConfig: Fix missing error text when library version is specifiedGautier Pelloux-Prayer2016-11-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Merge topic 'vs-default-build-package'Brad King2016-11-297-14/+69
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e3164df VS: Add option to place `PACKAGE` target in solution default build
| * | | | | | | | | | VS: Add option to place `PACKAGE` target in solution default buildMichael Stürmer2016-11-297-14/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD` variable to control this behavior.
* | | | | | | | | | | Merge topic 'try_compile-honor-CMAKE_WARN_DEPRECATED'Brad King2016-11-294-0/+28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d604c49 try_compile: Honor CMAKE_WARN_DEPRECATED in test project
| * | | | | | | | | | | try_compile: Honor CMAKE_WARN_DEPRECATED in test projectBrad King2016-11-224-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes the `-Wno-deprecated` option to be honored even inside a `try_compile` test project, which is needed to suppress all deprecation warnings as the option documents. Closes: #16446
* | | | | | | | | | | | Merge topic 'initial_cuda_language_support'Brad King2016-11-2967-19/+2131
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| * | | | | | | | | | | | Help: Add release note for CUDA supportBrad King2016-11-141-0/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Add tests to verify CUDA compiler works properly.Robert Maynard2016-11-1437-0/+624
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Prefer environment variables CUDACXX and CUDAHOSTCXX.Robert Maynard2016-11-142-1/+19
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Add support for CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITYRobert Maynard2016-11-141-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Add separable compilation support to the makefile generator.Robert Maynard2016-11-144-0/+459
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Add separable compilation support to the ninja generator.Robert Maynard2016-11-142-0/+368
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Add support for the CUDA_SEPARABLE_COMPILATION target propertyRobert Maynard2016-11-144-9/+44
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Add LinkLineComputer that computes cuda dlink lines.Robert Maynard2016-11-144-0/+113
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Refactor cmLinkLineComputer to allow for better derived children.Robert Maynard2016-11-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Derived children of cmLinkLineComputer need to be able to use member variables such as OutputConverter and the previously private methods.
| * | | | | | | | | | | | CUDA: Refactor CMakeCUDAInformation to prepare for separable compilation.Robert Maynard2016-11-142-9/+71
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: C++ compile features now enable cuda c++11 support.Robert Maynard2016-11-141-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Use the host compiler for linking CUDA executables and shared libs.Robert Maynard2016-11-147-14/+69
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: add support for specifying an explicit host compiler.Robert Maynard2016-11-143-5/+25
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Enable header dependency scanning.Robert Maynard2016-11-142-2/+16
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: State that cuda has preprocessor output and can generate assembly.Robert Maynard2016-11-142-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can consider PTX code to be a form of assembly.
| * | | | | | | | | | | | CUDA: We now properly perform CUDA compiler identification.Robert Maynard2016-11-147-8/+49
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: CompilerId now errors out properly when passed a non CUDA compiler.Robert Maynard2016-11-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we only reported an error if the compiler was a C compiler.
| * | | | | | | | | | | | CUDA: Explicitly state all source files are cuda sources.Robert Maynard2016-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way you can mark a .C/.CPP files as a cuda source file and have nvcc build it as a cuda file.
| * | | | | | | | | | | | CUDA: Add support language levels (98/11)Robert Maynard2016-11-144-6/+14
| | | | | | | | | | | | |
| * | | | | | | | | | | | CUDA: Add basic CUDA language support for *NIX systems.Robert Maynard2016-11-147-0/+286
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'librhash-left-shift-unsigned'Brad King2016-11-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e07ffa4 librhash: Avoid signed left-shift overflow in sha256
| * | | | | | | | | | | | | librhash: Avoid signed left-shift overflow in sha256Brad King2016-11-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `rhash_sha256_final` to use unsigned integers for left shifting to avoid the possibility of undefined overflow behavior.
* | | | | | | | | | | | | | Merge topic 'libarchive-openssl-1.1'Brad King2016-11-299-41/+183
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | 6f23daea libarchive: Add support for building with OpenSSL 1.1 7d433206 libarchive: Add headers to adapt between OpenSSL 1.1 and older versions
| * | | | | | | | | | | | libarchive: Add support for building with OpenSSL 1.1Brad King2016-11-286-38/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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