summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'try_compile-custom-variables'Brad King2016-05-267-74/+118
|\ | | | | | | | | | | d256ba07 try_compile: Optionally forward custom platform variables to test project fb4791b3 cmCoreTryCompile: Refactor forwarding of variables to test project
| * try_compile: Optionally forward custom platform variables to test projectBrad King2016-05-257-0/+58
| | | | | | | | | | | | | | | | | | Add a `CMAKE_TRY_COMPILE_PLATFORM_VARIABLES` variable to specify a list of custom variables to be forwarded to a `try_compile` test project. This will be useful for platform information modules or toolchain files to forward some platform-specific set of variables from the host project (perhaps set in its cache) to the test project so that it can build the same way.
| * cmCoreTryCompile: Refactor forwarding of variables to test projectBrad King2016-05-251-74/+60
| | | | | | | | | | | | | | De-duplicate the logic that constructs the cmake `-D` flag used to pass variables into the test project cache. Also subsume variables that were propagated by generating `set()` commands in the project and pass them as cache entries instead.
* | Merge topic 'fix-variable-watch-leak'Brad King2016-05-261-2/+4
|\ \ | | | | | | | | | | | | 75e3e0d3 cmVariableWatch: Fix potential memory leak
| * | cmVariableWatch: Fix potential memory leakBrad King2016-05-251-2/+4
| |/ | | | | | | | | Teach cmVariableWatch::AddWatch to own the Pair it allocates until it needs to pass ownership to WatchMap.
* | Merge topic 'cpack-dmg-no-app-link'Brad King2016-05-263-5/+21
|\ \ | | | | | | | | | | | | 3acc29fc CPack/DragNDrop: Optionally disable `/Applications` symlink
| * | CPack/DragNDrop: Optionally disable `/Applications` symlinkHarry Mallon2016-05-253-5/+21
| |/
* | Merge topic 'FindCUDA-cublas_device'Brad King2016-05-262-2/+8
|\ \ | | | | | | | | | | | | 81e73b72 FindCUDA: Add support for finding the cublas_device library
| * | FindCUDA: Add support for finding the cublas_device libraryJames Sharpe2016-05-252-2/+8
| |/
* | Merge topic 'style-cmSystemTools'Brad King2016-05-261-1/+1
|\ \ | | | | | | | | | | | | 8e801eb5 cmSystemTools: Fix indentation typo
| * | cmSystemTools: Fix indentation typoBrad King2016-05-251-1/+1
| | |
* | | 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
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2016-05-261-1/+1
| |_|/ |/| |
* | | Merge topic 'improve-character-find-and-replace'Brad King2016-05-2536-81/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5784747d Improve string find: prefer character overloads. 5cec953e Use std::replace for replacing chars in strings. 2a1a2033 cmExtraEclipseCDT4Generator: use std::replace. 34bc6e1f cmCTestScriptHandler: don't call find repeatedly.
| * | | Improve string find: prefer character overloads.Daniel Pfeifer2016-05-2419-37/+37
| | | | | | | | | | | | | | | | | | | | Apply fix-its from clang-tidy's performance-faster-string-find checker. Ignore findings in kwsys.
| * | | Use std::replace for replacing chars in strings.Daniel Pfeifer2016-05-2417-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find uses of `cmSystemTools::ReplaceString` where both `replace` and `with` are string literals with a size of one. Automate with: git grep -l ReplaceString | xargs sed -i "s|cmSystemTools::ReplaceString(\([^,]*\), \"\(.\)\", \"\(.\)\");|std::replace(\1.begin(), \1.end(), '\2', '\3');|g" git grep -l ReplaceString | xargs sed -i "s|cmSystemTools::ReplaceString(\([^,]*\), \"\(.\)\", \"\\\\\\\\\");|std::replace(\1.begin(), \1.end(), '\2', '\\\\\\\\');|g" git grep -l ReplaceString | xargs sed -i "s|cmSystemTools::ReplaceString(\([^,]*\), \"\\\\\\\\\", \"\(.\)\");|std::replace(\1.begin(), \1.end(), '\\\\\\\\', '\2');|g"
| * | | cmExtraEclipseCDT4Generator: use std::replace.Daniel Pfeifer2016-05-241-5/+1
| | | |
| * | | cmCTestScriptHandler: don't call find repeatedly.Daniel Pfeifer2016-05-241-3/+4
| |/ / | | | | | | | | | Also, prefer the character overload.
* | | 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 'standard-include-directories'Brad King2016-05-2512-2/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1340827 Add a variable to specify language-wide system include directories 44199097 cmMakefile: Optimize AddSystemIncludeDirectories for empty set a896043b GHS: Compute include directories consistently with other generators
| * | | | Add a variable to specify language-wide system include directoriesBrad King2016-05-2510-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` variable to specify system include directories for for `<LANG>` compiler command lines. This plays a role for include directories as the existing `CMAKE_<LANG>_STANDARD_LIBRARIES` variable does for link libraries.
| * | | | cmMakefile: Optimize AddSystemIncludeDirectories for empty setBrad King2016-05-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Do not bother looping over all targets if we have no system include directories to add anyway.
| * | | | GHS: Compute include directories consistently with other generatorsBrad King2016-05-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | All generators use cmLocalGenerator::GetIncludeDirectories to construct the final list of include directories for a target.
* | | | | Merge topic 'doc-standard-libs'Brad King2016-05-254-8/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 7807b3a9 Help: Document CMAKE_<LANG>_STANDARD_LIBRARIES variable
| * | | | Help: Document CMAKE_<LANG>_STANDARD_LIBRARIES variableBrad King2016-05-244-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Also drop documentation of non-existent CMAKE_STANDARD_LIBRARIES variable.
* | | | | Merge topic 'output-converter-enums'Brad King2016-05-2525-302/+339
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 25d1ef64 Use enums defined in cmOutputConverter using their fully qualified name.
| * | | | | Use enums defined in cmOutputConverter using their fully qualified name.Daniel Pfeifer2016-05-2525-302/+339
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly automated: values=("RelativeRoot" "NONE" "FULL" "HOME" "START" "HOME_OUTPUT" "START_OUTPUT" "OutputFormat" "UNCHANGED" "MAKERULE" "SHELL" "WATCOMQUOTE" "RESPONSE" "FortranFormat" "FortranFormatNone" "FortranFormatFixed" "FortranFormatFree") for i in "${values[@]}"; do git grep -l cmLocalGenerator::$i | xargs sed -i "s|cmLocalGenerator::$i|cmOutputConverter::$i|g"; done
* | | | | CMake Nightly Date StampKitware Robot2016-05-251-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'cpack-deb-different-package-names'Brad King2016-05-2422-30/+120
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | adbd3985 CPack/Deb possibility to change package name
| * | | | CPack/Deb possibility to change package nameDomen Vrankar2016-05-2322-30/+120
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-244-14/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4f3b9706 CPack/Deb prevent accidental component dependencies
| * | | | CPack/Deb prevent accidental component dependenciesDomen Vrankar2016-05-234-14/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |/ / / | |/| | |
* | | | | Merge topic 'cpackifw-updates'Brad King2016-05-243-23/+44
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | 06ca7795 CPackIFW: Command cpack_ifw_configure_component learned ESSENTIAL option 222fa595 CPackIFW: Doc decoration
| * | | | CPackIFW: Command cpack_ifw_configure_component learned ESSENTIAL optionKonstantin Podsvirov2016-05-233-2/+19
| | | | |
| * | | | CPackIFW: Doc decorationKonstantin Podsvirov2016-05-231-21/+25
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2016-05-241-1/+1
|/ / /
* | | Merge topic 'rpath-no-regex'Brad King2016-05-231-26/+22
|\ \ \ | | |/ | |/| | | | | | | f4d3c44c Fix support for large RPATH updates (#16105)
| * | Fix support for large RPATH updates (#16105)Brad King2016-05-191-26/+22
| | | | | | | | | | | | | | | Avoid using a KWSys RegularExpression to search for RPATH substrings. It cannot handle large expressions.
* | | Merge topic 'make_osx_packaging_more_robust'Brad King2016-05-231-2/+17
|\ \ \ | | | | | | | | | | | | | | | | d3812437 Make packaging script wait for the disk image to be mounted.
| * | | Make packaging script wait for the disk image to be mounted.Robert Maynard2016-05-191-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | Frequently the apple script would execute before the disk image had been fully mounted, and would fail. We now try to wait for the disk to be mounted first.
* | | | Merge topic 'clang-format-script'Brad King2016-05-231-2/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2f2117e7 clang-format.bash: Limit formatting to files selected by options
| * | | | clang-format.bash: Limit formatting to files selected by optionsBrad King2016-05-201-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that our one-shot clang-format run is complete we rarely need to filter the entire tree anymore. Filter nothing if no options are given and just print the usage message. Offer options to specify selection of some set of files from Git as needed for various workflows.