Brad King
67cc866877
Merge topic 'fix-variable-watch-leak'
...
75e3e0d3
cmVariableWatch: Fix potential memory leak
2016-05-26 09:52:09 -04:00
Brad King
579185be7a
Merge topic 'cpack-dmg-no-app-link'
...
3acc29fc
CPack/DragNDrop: Optionally disable `/Applications` symlink
2016-05-26 09:52:07 -04:00
Brad King
903bcbc39e
Merge topic 'FindCUDA-cublas_device'
...
81e73b72
FindCUDA: Add support for finding the cublas_device library
2016-05-26 09:52:04 -04:00
Brad King
2a028b7898
Merge topic 'style-cmSystemTools'
...
8e801eb5
cmSystemTools: Fix indentation typo
2016-05-26 09:52:02 -04:00
Brad King
7bfcfd59fb
Merge topic 'FindMatlab-2016a'
...
715e4cf5
FindMatlab: Add support for Matlab 2016a (9.0)
2016-05-26 09:51:58 -04:00
Brad King
b86bcd4046
Merge topic 'GetPrerequisites-more-paths'
...
c9cebed5
GetPrerequisites: Look for VS tools using registry entries (#16108 )
2016-05-26 09:51:56 -04:00
Brad King
cffe0ed798
OS X: Drop warning about SDK and deployment target version mismatch
...
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>
2016-05-26 09:20:28 -04:00
Kitware Robot
0746a4c62c
CMake Nightly Date Stamp
2016-05-26 00:03:52 -04:00
Brad King
8479dc46f1
liblzma: Avoid possible overflow on signed left shift
...
Use an unsigned value to produce the needed mask.
2016-05-25 10:02:02 -04:00
Brad King
75e3e0d3dc
cmVariableWatch: Fix potential memory leak
...
Teach cmVariableWatch::AddWatch to own the Pair it allocates until
it needs to pass ownership to WatchMap.
2016-05-25 09:58:36 -04:00
Harry Mallon
3acc29fca9
CPack/DragNDrop: Optionally disable `/Applications` symlink
2016-05-25 09:51:04 -04:00
James Sharpe
81e73b7240
FindCUDA: Add support for finding the cublas_device library
2016-05-25 09:42:25 -04:00
Brad King
d256ba078a
try_compile: Optionally forward custom platform variables to test project
...
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.
2016-05-25 09:36:19 -04:00
Brad King
fb4791b37c
cmCoreTryCompile: Refactor forwarding of variables to test project
...
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.
2016-05-25 09:36:19 -04:00
Brad King
6052e4b3bf
Merge topic 'improve-character-find-and-replace'
...
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.
2016-05-25 09:34:29 -04:00
Brad King
9ebc209288
Merge topic 'FindCUDA-flags-genex'
...
6b190b5c
FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS
2016-05-25 09:34:26 -04:00
Brad King
916d52533e
Merge topic 'standard-include-directories'
...
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
2016-05-25 09:34:24 -04:00
Brad King
8cd007fee6
Merge topic 'doc-standard-libs'
...
7807b3a9
Help: Document CMAKE_<LANG>_STANDARD_LIBRARIES variable
2016-05-25 09:34:21 -04:00
Brad King
2bc55b69db
Merge topic 'output-converter-enums'
...
25d1ef64
Use enums defined in cmOutputConverter using their fully qualified name.
2016-05-25 09:34:19 -04:00
Chuck Atkins
6b190b5c52
FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS
...
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.
2016-05-25 09:31:35 -04:00
Brad King
c13408279f
Add a variable to specify language-wide system include directories
...
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.
2016-05-25 09:30:31 -04:00
Brad King
8e801eb517
cmSystemTools: Fix indentation typo
2016-05-25 09:27:54 -04:00
Daniel Pfeifer
25d1ef6424
Use enums defined in cmOutputConverter using their fully qualified name.
...
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
2016-05-25 09:20:09 -04:00
Francesco Romano
715e4cf57c
FindMatlab: Add support for Matlab 2016a (9.0)
2016-05-25 09:08:32 -04:00
Brad King
c9cebed5d8
GetPrerequisites: Look for VS tools using registry entries ( #16108 )
2016-05-25 09:00:33 -04:00
Kitware Robot
d5ccab37b3
CMake Nightly Date Stamp
2016-05-25 00:01:07 -04:00
Daniel Pfeifer
5784747d1b
Improve string find: prefer character overloads.
...
Apply fix-its from clang-tidy's performance-faster-string-find checker.
Ignore findings in kwsys.
2016-05-24 23:22:24 +02:00
Daniel Pfeifer
5cec953e6a
Use std::replace for replacing chars in strings.
...
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"
2016-05-24 23:22:20 +02:00
Daniel Pfeifer
2a1a2033af
cmExtraEclipseCDT4Generator: use std::replace.
2016-05-24 23:22:16 +02:00
Daniel Pfeifer
34bc6e1f3b
cmCTestScriptHandler: don't call find repeatedly.
...
Also, prefer the character overload.
2016-05-24 23:22:08 +02:00
Brad King
a98a699987
Merge topic 'cpack-deb-different-package-names'
...
adbd3985
CPack/Deb possibility to change package name
2016-05-24 13:54:03 -04:00
Brad King
384de98709
Merge topic 'cpack-deb-component-depends'
...
4f3b9706
CPack/Deb prevent accidental component dependencies
2016-05-24 13:54:00 -04:00
Brad King
185be83815
Merge topic 'ExternalProject-fix-stash-all'
...
2bc981e6
ExternalProject: Fix git stash not using "--all" option
2016-05-24 13:53:58 -04:00
Brad King
7d5355a21a
Merge topic 'doc-CPACK_DMG_FORMAT'
...
239367f0
CPackDMG: Document CPACK_DMG_FORMAT default
2016-05-24 13:53:55 -04:00
Brad King
f77a49ff30
Merge topic 'cpackifw-updates'
...
06ca7795
CPackIFW: Command cpack_ifw_configure_component learned ESSENTIAL option
222fa595
CPackIFW: Doc decoration
2016-05-24 13:53:53 -04:00
Brad King
4419909756
cmMakefile: Optimize AddSystemIncludeDirectories for empty set
...
Do not bother looping over all targets if we have no system include
directories to add anyway.
2016-05-24 11:40:35 -04:00
Brad King
a896043bac
GHS: Compute include directories consistently with other generators
...
All generators use cmLocalGenerator::GetIncludeDirectories to construct
the final list of include directories for a target.
2016-05-24 11:40:35 -04:00
Brad King
7807b3a9db
Help: Document CMAKE_<LANG>_STANDARD_LIBRARIES variable
...
Also drop documentation of non-existent CMAKE_STANDARD_LIBRARIES
variable.
2016-05-24 11:40:25 -04:00
Kitware Robot
ecb4ad2aa2
CMake Nightly Date Stamp
2016-05-24 00:01:36 -04:00
Domen Vrankar
4f3b97063f
CPack/Deb prevent accidental component dependencies
...
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.
2016-05-23 20:21:32 +02:00
Domen Vrankar
adbd3985f8
CPack/Deb possibility to change package name
...
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.
2016-05-23 19:55:46 +02:00
Harry Mallon
239367f036
CPackDMG: Document CPACK_DMG_FORMAT default
2016-05-23 13:27:02 -04:00
Konstantin Podsvirov
06ca7795f4
CPackIFW: Command cpack_ifw_configure_component learned ESSENTIAL option
2016-05-23 19:09:03 +03:00
Konstantin Podsvirov
222fa595cd
CPackIFW: Doc decoration
2016-05-23 19:09:03 +03:00
Brad King
c75d91a05c
Merge topic 'rpath-no-regex'
...
f4d3c44c
Fix support for large RPATH updates (#16105 )
2016-05-23 09:42:23 -04:00
Brad King
64d3613195
Merge topic 'make_osx_packaging_more_robust'
...
d3812437
Make packaging script wait for the disk image to be mounted.
2016-05-23 09:42:20 -04:00
Brad King
16b42d842e
Merge topic 'clang-format-script'
...
2f2117e7
clang-format.bash: Limit formatting to files selected by options
2016-05-23 09:42:18 -04:00
Kitware Robot
2c13f1b7f0
CMake Nightly Date Stamp
2016-05-23 00:01:06 -04:00
Kitware Robot
52eeef3264
CMake Nightly Date Stamp
2016-05-22 00:01:04 -04:00
Christian Fetzer
2bc981e669
ExternalProject: Fix git stash not using "--all" option
...
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.
2016-05-21 11:41:34 +02:00