Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'FindHDF5-handle-unsuffixed' into release | Brad King | 2016-06-27 | 1 | -4/+21 |
|\ | |||||
| * | FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake | Robert Maynard | 2016-06-24 | 1 | -0/+4 |
| | | |||||
| * | FindHDF5: cache the correct path to the high level libraries | Robert Maynard | 2016-06-24 | 1 | -3/+3 |
| | | |||||
| * | FindHDF5: When component targets not found fallback to compiler wrappers | Robert Maynard | 2016-06-23 | 1 | -0/+6 |
| | | |||||
| * | FindHDF5: Handle HDF5 builds with non-suffixed components | Robert Maynard | 2016-06-23 | 1 | -0/+7 |
| | | |||||
| * | FindHDF5: correctly add lang to each component target name. | Robert Maynard | 2016-06-23 | 1 | -1/+1 |
| | | |||||
* | | GetPrerequisites: fix typo in comment | Rolf Eike Beer | 2016-06-22 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'pkgconfig-targets' into release | Brad King | 2016-06-20 | 1 | -2/+6 |
|\ | |||||
| * | FindPkgConfig: define the imported targets also when the data comes from cache | Rolf Eike Beer | 2016-06-19 | 1 | -2/+6 |
| | | |||||
* | | Merge branch 'FindQt4-doc-QtDeclarative-imported' into release | Brad King | 2016-06-20 | 1 | -0/+2 |
|\ \ | |||||
| * | | FindQt4: Document Qt4::QtDeclarative imported target (#16157) | Brad King | 2016-06-20 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch 'revert-vs-clang-minsize' into release | Brad King | 2016-06-17 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | VS: Fix regressed mapping for the cl `/Os` compiler flag | Brad King | 2016-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct compiler settings, 2016-02-18) a flag mapping was added for the clang `-Os` flag. However, this collides with a mapping we already had for the MSVC flag of the same name. This is a symptom of a larger problem in that the VS generators need a per-toolset flag map (issue #16153). For now, simply drop the new mapping and drop `-Os` from clang compiler flags in the MinSizeRel configuration. Reported-by: Felix Bruns <felixbruns@gmail.com> | ||||
* | | Merge branch 'SunOS-PathScale' into release | Brad King | 2016-06-06 | 4 | -0/+37 |
|\ \ | |||||
| * | | Platform: add flag definitions for PathScale compiler on SunOS (#16135) | Michał Górny | 2016-06-06 | 4 | -0/+37 |
| |/ | |||||
* | | Merge branch 'FindLibArchive-3.2' into release | Brad King | 2016-06-03 | 1 | -4/+5 |
|\ \ | |||||
| * | | FindLibArchive: Support libarchive 3.2 version string format | Orion Poplawski | 2016-06-03 | 1 | -4/+5 |
| |/ | |||||
* | | Merge branch 'FindHDF5-fix-already-found' into releasev3.6.0-rc1 | Brad King | 2016-06-02 | 1 | -4/+11 |
|\ \ | |||||
| * | | FindHDF5: Add backwards compatability for already-found searches | Chuck Atkins | 2016-06-02 | 1 | -4/+11 |
| |/ | |||||
* | | Compiler/TI: Pass libraries as last part to linker | Alexander Stein | 2016-06-02 | 1 | -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> | ||||
* | Merge topic 'UseJava-fix-typo' | Brad King | 2016-06-01 | 1 | -1/+1 |
|\ | | | | | | | | | bcf39688 UseJava: Fix grammar error in documentation | ||||
| * | UseJava: Fix grammar error in documentation | Matthew Woehlke | 2016-05-31 | 1 | -1/+1 |
| | | |||||
* | | CPackRPM and CPackDeb documentation improvements | Domen Vrankar | 2016-06-01 | 2 | -113/+165 |
|/ | |||||
* | Merge topic 'osx-no-warn-sdk-target-mismatch' | Brad King | 2016-05-27 | 1 | -10/+0 |
|\ | | | | | | | | | cffe0ed7 OS X: Drop warning about SDK and deployment target version mismatch | ||||
| * | OS X: Drop warning about SDK and deployment target version mismatch | Brad King | 2016-05-26 | 1 | -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 King | 2016-05-26 | 1 | -0/+5 |
|\ \ | | | | | | | | | | | | | 3acc29fc CPack/DragNDrop: Optionally disable `/Applications` symlink | ||||
| * | | CPack/DragNDrop: Optionally disable `/Applications` symlink | Harry Mallon | 2016-05-25 | 1 | -0/+5 |
| |/ | |||||
* | | Merge topic 'FindCUDA-cublas_device' | Brad King | 2016-05-26 | 1 | -2/+4 |
|\ \ | | | | | | | | | | | | | 81e73b72 FindCUDA: Add support for finding the cublas_device library | ||||
| * | | FindCUDA: Add support for finding the cublas_device library | James Sharpe | 2016-05-25 | 1 | -2/+4 |
| |/ | |||||
* | | Merge topic 'FindMatlab-2016a' | Brad King | 2016-05-26 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | 715e4cf5 FindMatlab: Add support for Matlab 2016a (9.0) | ||||
| * | | FindMatlab: Add support for Matlab 2016a (9.0) | Francesco Romano | 2016-05-25 | 1 | -0/+1 |
| | | | |||||
* | | | Merge topic 'GetPrerequisites-more-paths' | Brad King | 2016-05-26 | 1 | -0/+7 |
|\ \ \ | |_|/ |/| | | | | | | | | c9cebed5 GetPrerequisites: Look for VS tools using registry entries (#16108) | ||||
| * | | GetPrerequisites: Look for VS tools using registry entries (#16108) | Brad King | 2016-05-25 | 1 | -0/+7 |
| |/ | |||||
* | | Merge topic 'FindCUDA-flags-genex' | Brad King | 2016-05-25 | 1 | -2/+7 |
|\ \ | |/ |/| | | | | | 6b190b5c FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS | ||||
| * | FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS | Chuck Atkins | 2016-05-25 | 1 | -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 King | 2016-05-24 | 1 | -7/+63 |
|\ \ | | | | | | | | | | | | | adbd3985 CPack/Deb possibility to change package name | ||||
| * | | CPack/Deb possibility to change package name | Domen Vrankar | 2016-05-23 | 1 | -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 King | 2016-05-24 | 1 | -13/+23 |
|\ \ | | | | | | | | | | | | | 4f3b9706 CPack/Deb prevent accidental component dependencies | ||||
| * | | CPack/Deb prevent accidental component dependencies | Domen Vrankar | 2016-05-23 | 1 | -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 King | 2016-05-24 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | 2bc981e6 ExternalProject: Fix git stash not using "--all" option | ||||
| * | | ExternalProject: Fix git stash not using "--all" option | Christian Fetzer | 2016-05-21 | 1 | -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 King | 2016-05-24 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | 239367f0 CPackDMG: Document CPACK_DMG_FORMAT default | ||||
| * | | CPackDMG: Document CPACK_DMG_FORMAT default | Harry Mallon | 2016-05-23 | 1 | -1/+1 |
| |/ | |||||
* | | CPackIFW: Command cpack_ifw_configure_component learned ESSENTIAL option | Konstantin Podsvirov | 2016-05-23 | 1 | -2/+5 |
| | | |||||
* | | CPackIFW: Doc decoration | Konstantin Podsvirov | 2016-05-23 | 1 | -21/+25 |
|/ | |||||
* | Merge topic 'FindCUDA-fp16' | Brad King | 2016-05-20 | 1 | -0/+7 |
|\ | | | | | | | | | cc95001b FindCUDA: Detect and report FP16 support | ||||
| * | FindCUDA: Detect and report FP16 support | Boris Fomitchev | 2016-05-19 | 1 | -0/+7 |
| | | | | | | | | Reviewed-by: James Bigler <jamesbigler@gmail.com> | ||||
* | | ExternalProject: Re-implement download logic as a dedicated script | Ruslan Baratov | 2016-05-19 | 2 | -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 script | Ruslan Baratov | 2016-05-19 | 2 | -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 verification | Ruslan Baratov | 2016-05-19 | 1 | -1/+2 |
| | | | | | | | | Verify step for downloaded files will be performed in separate script. |