summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'minor-cleanups'Brad King2016-06-037-0/+3
|\ | | | | | | | | | | f6c21894 Modules: Rename internal platform-specific compiler determination modules 0c7951a9 cmLocalGenerator: Consolidate conditions in AddArchitectureFlags
| * Modules: Rename internal platform-specific compiler determination modulesBrad King2016-06-027-0/+3
| | | | | | | | | | | | | | Rename Modules/Platform/<os>-<lang>.cmake files to Modules/Platform/<os>-Determine-<lang>.cmake to clarify their role. For compatibility with user-provided modules, load the old names if they exist.
* | Merge topic 'cpack-nsis-remove-duplicate-include'Brad King2016-06-031-7/+0
|\ \ | | | | | | | | | | | | e847b6c8 CPack/NSIS: Remove duplicate include from NSIS.template.in (#16132)
| * | CPack/NSIS: Remove duplicate include from NSIS.template.in (#16132)Brad King2016-06-021-7/+0
| |/ | | | | | | | | | | In commit v2.6.0~3438 (ENH: Better support for adding and removing path, 2006-04-27) an include of "WinMessages.NSH" was added without removing the original include. Remove it now.
* | Merge topic 'FindOpenCL-imported-target'Brad King2016-06-031-2/+18
|\ \ | | | | | | | | | | | | b66d4739 FindOpenCL: Add an imported target
| * | FindOpenCL: Add an imported targetMatthäus G. Chajdas2016-06-021-2/+18
| |/
* | Merge topic 'compiler-id-with-bracket-in-path'Brad King2016-06-031-2/+3
|\ \ | | | | | | | | | | | | a7d1c4ec CMakeDetermineCompilerId: Fix compiler id with square brackets in the path
| * | CMakeDetermineCompilerId: Fix compiler id with square brackets in the pathBrad King2016-06-021-2/+3
| |/ | | | | | | | | | | | | | | | | | | We use file(GLOB) to load the list of files produced by compiling the compiler identification source. Encode square brackets in the path to the directory so that they are not treated as special characters in the globbing expression. Otherwise we fail to find any files when the path contains square brackets and the compiler id is unknown. Reported-by: Esch Nigma <eschnigma@openmailbox.org>
* | Merge topic 'fix-ti-link-order'Brad King2016-06-031-1/+1
|\ \ | | | | | | | | | | | | 89317915 Compiler/TI: Pass libraries as last part to linker
| * | Compiler/TI: Pass libraries as last part to linkerAlexander Stein2016-06-021-1/+1
| |/ | | | | | | | | | | | | | | | | If e.g. libc.a is passed before any objects the linker raises the follwing warning: cannot resolve archive libc.a to a compatible library, as no input files have been encountered In the end the library is skipped and missing symbols occur. Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
* | FindHDF5: Add backwards compatability for already-found searchesChuck Atkins2016-06-021-4/+11
|/
* Merge topic 'UseJava-fix-typo'Brad King2016-06-011-1/+1
|\ | | | | | | | | bcf39688 UseJava: Fix grammar error in documentation
| * UseJava: Fix grammar error in documentationMatthew Woehlke2016-05-311-1/+1
| |
* | CPackRPM and CPackDeb documentation improvementsDomen Vrankar2016-06-012-113/+165
|/
* Merge topic 'osx-no-warn-sdk-target-mismatch'Brad King2016-05-271-10/+0
|\ | | | | | | | | cffe0ed7 OS X: Drop warning about SDK and deployment target version mismatch
| * OS X: Drop warning about SDK and deployment target version mismatchBrad King2016-05-261-10/+0
| | | | | | | | | | | | | | | | | | OS X supports using the SDK for any version equal to or newer than the deployment target. There is no reason to warn if the versions do not match exactly. Suggested-by: James Burgess <jamesrburgess@mac.com> Suggested-by: Clinton Stimpson <clinton@elemtech.com>
* | Merge topic 'cpack-dmg-no-app-link'Brad King2016-05-261-0/+5
|\ \ | | | | | | | | | | | | 3acc29fc CPack/DragNDrop: Optionally disable `/Applications` symlink
| * | CPack/DragNDrop: Optionally disable `/Applications` symlinkHarry Mallon2016-05-251-0/+5
| |/
* | Merge topic 'FindCUDA-cublas_device'Brad King2016-05-261-2/+4
|\ \ | | | | | | | | | | | | 81e73b72 FindCUDA: Add support for finding the cublas_device library
| * | FindCUDA: Add support for finding the cublas_device libraryJames Sharpe2016-05-251-2/+4
| |/
* | Merge topic 'FindMatlab-2016a'Brad King2016-05-261-0/+1
|\ \ | | | | | | | | | | | | 715e4cf5 FindMatlab: Add support for Matlab 2016a (9.0)
| * | FindMatlab: Add support for Matlab 2016a (9.0)Francesco Romano2016-05-251-0/+1
| | |
* | | Merge topic 'GetPrerequisites-more-paths'Brad King2016-05-261-0/+7
|\ \ \ | |_|/ |/| | | | | | | | c9cebed5 GetPrerequisites: Look for VS tools using registry entries (#16108)
| * | GetPrerequisites: Look for VS tools using registry entries (#16108)Brad King2016-05-251-0/+7
| |/
* | Merge topic 'FindCUDA-flags-genex'Brad King2016-05-251-2/+7
|\ \ | |/ |/| | | | | 6b190b5c FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS
| * FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGSChuck Atkins2016-05-251-2/+7
| | | | | | | | | | | | Follow the configure_file by a file(GENERATE) so the resulting cmake scripts used by FindCUDA for wrapping nvcc calls can now support generator expressions in the CUDA_NVCC_FLAGS variable.
* | Merge topic 'cpack-deb-different-package-names'Brad King2016-05-241-7/+63
|\ \ | | | | | | | | | | | | adbd3985 CPack/Deb possibility to change package name
| * | CPack/Deb possibility to change package nameDomen Vrankar2016-05-231-7/+63
| |/ | | | | | | | | | | | | | | This patch preserves backward compatibility of deb package names with previous CMake versions but similarly to CPack/RPM allows to change package name format and supports DEB-DEFAULT setting that produces proper Debian package names.
* | Merge topic 'cpack-deb-component-depends'Brad King2016-05-241-13/+23
|\ \ | | | | | | | | | | | | 4f3b9706 CPack/Deb prevent accidental component dependencies
| * | CPack/Deb prevent accidental component dependenciesDomen Vrankar2016-05-231-13/+23
| |/ | | | | | | | | | | | | | | | | | | Prevent accidental inter component dependency setting since this is a breaking feature in situations where another CPack module is already using the feature. It should be enabled if desired since it can cause issues when upgrading only one of the components for e.g. configuration instead of all the components at once.
* | Merge topic 'ExternalProject-fix-stash-all'Brad King2016-05-241-0/+2
|\ \ | | | | | | | | | | | | 2bc981e6 ExternalProject: Fix git stash not using "--all" option
| * | ExternalProject: Fix git stash not using "--all" optionChristian Fetzer2016-05-211-0/+2
| |/ | | | | | | | | | | GIT_VERSION_STRING is unset in _ep_write_gitupdate_script(), hence git stash is not being called with the "--all" option, even if Git is new enough to support this.
* | Merge topic 'doc-CPACK_DMG_FORMAT'Brad King2016-05-241-1/+1
|\ \ | | | | | | | | | | | | 239367f0 CPackDMG: Document CPACK_DMG_FORMAT default
| * | CPackDMG: Document CPACK_DMG_FORMAT defaultHarry Mallon2016-05-231-1/+1
| |/
* | CPackIFW: Command cpack_ifw_configure_component learned ESSENTIAL optionKonstantin Podsvirov2016-05-231-2/+5
| |
* | CPackIFW: Doc decorationKonstantin Podsvirov2016-05-231-21/+25
|/
* Merge topic 'FindCUDA-fp16'Brad King2016-05-201-0/+7
|\ | | | | | | | | cc95001b FindCUDA: Detect and report FP16 support
| * FindCUDA: Detect and report FP16 supportBoris Fomitchev2016-05-191-0/+7
| | | | | | | | Reviewed-by: James Bigler <jamesbigler@gmail.com>
* | ExternalProject: Re-implement download logic as a dedicated scriptRuslan Baratov2016-05-192-42/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the content to a `ExternalProject-download.cmake.in` file and use `configure_file` to generate the final script. Retry logic was not working before because similar script trigger FATAL_ERROR if 'file(DOWNLOAD ...)' exits with nonzero 'status_code'. FATAL_ERROR makes the whole chain of commands stop and '_ep_write_verifyfile_script' retry logic was not used in fact. Default retry number set to 5 with pauses 0, 5, 5, 15, 60 seconds. Some space left for future improvements if needed (90, 300, 1200=20min). Can be controlled by user.
* | ExternalProject: Re-implement download verification as a dedicated scriptRuslan Baratov2016-05-192-25/+66
| | | | | | | | | | Move the content to a `ExternalProject-verify.cmake.in` file and use `configure_file` to generate the final script.
* | ExternalProject: Avoid repeating download verificationRuslan Baratov2016-05-191-1/+2
| | | | | | | | Verify step for downloaded files will be performed in separate script.
* | ExternalProject: Remove unused verify script logicRuslan Baratov2016-05-191-17/+2
| | | | | | | | The logic to re-run the download script will be moved elsewhere.
* | ExternalProject: Remove unused 'retries' argument from verify scriptRuslan Baratov2016-05-191-4/+3
| | | | | | | | | | There is no retries for local files and retry logic is broken for downloads. Will be implemented in '*-download.cmake' script.
* | ExternalProject: Use uppercase placeholders for script generationRuslan Baratov2016-05-191-27/+27
|/ | | | Use uppercase variables for future 'configure_file' command.
* Merge topic 'ExternalProject-UPDATE_COMMAND-always'Brad King2016-05-191-0/+3
|\ | | | | | | | | bdca6838 ExternalProject: Always run update step with non-empty UPDATE_COMMAND
| * ExternalProject: Always run update step with non-empty UPDATE_COMMANDBrad King2016-05-181-0/+3
| | | | | | | | | | | | | | | | The purpose of the `update` step is to run an update on each build (subject to `UPDATE_DISCONNECTED`). This is done for version-controlled source directories. We should do it for a custom `UPDATE_COMMAND` too. In particular, when `UPDATE_DISCONNECTED` is used we expect the `skip-update` step to exist.
* | CPackIFW: Add support for Promoting UpdatesKonstantin Podsvirov2016-05-181-1/+82
| | | | | | | | | | | | | | | | Add support for this feature added by QtIFW 2.0.3: http://doc.qt.io/qtinstallerframework/ifw-updates.html Add a `cpack_ifw_update_repository` command as porcelain.
* | CPackIFW: Add more known QtIFW releasesKonstantin Podsvirov2016-05-181-0/+2
|/
* Merge topic 'ghs-shorter-object-names'Brad King2016-05-182-0/+2
|\ | | | | | | | | d7233a04 GHS: Use shorter object file names on collision
| * GHS: Use shorter object file names on collisionGeoff Viola2016-05-182-0/+2
| |