Brad King
ecf3c5c6f3
Merge topic 'fix-msvc-warnings'
...
5bcfe98bd5 Source: Fix various compiler warnings in Visual Studio 2017
70e245f19e cmAlgorithms: add utility functions to get signed size of containers
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2757
2019-01-10 08:00:44 -05:00
Brad King
49b3ebf5f5
Merge topic 'better_sphinx_colors'
...
db89590f36 Help: CMakeTemplateStyle uses colors that better contrast.
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2779
2019-01-10 07:55:46 -05:00
Kitware Robot
f2a78aeed9
CMake Nightly Date Stamp
2019-01-10 00:01:04 -05:00
Craig Scott
d085403f72
Merge branch 'release-3.13'
2019-01-10 08:43:09 +11:00
Craig Scott
1fe3d126a5
Merge topic 'BundleUtilities-make-dir'
...
200bf57742 BundleUtilities: Ensure target dir exists when creating symlinks
Acked-by: Kitware Robot <kwrobot@kitware.com >
Tested-by: Craig Scott <craig.scott@crascit.com >
Merge-request: !2728
2019-01-09 16:41:38 -05:00
Craig Scott
88c710ab56
Merge branch 'feature/fix-link_resolved_item_into_bundle' into release-3.13
...
Merge-request: !2728
2019-01-10 08:39:33 +11:00
Robert Maynard
db89590f36
Help: CMakeTemplateStyle uses colors that better contrast.
2019-01-09 15:53:26 -05:00
Bruno Manganelli
5bcfe98bd5
Source: Fix various compiler warnings in Visual Studio 2017
2019-01-09 08:25:10 -05:00
Brad King
c9854a5843
Merge branch 'release-3.13'
2019-01-09 08:19:56 -05:00
Brad King
90b08fc27b
Merge topic 'vs2017-skip-2019'
...
d44f81c217 VS: Exclude VS 2019 instances when using VS 2017 generator
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2775
2019-01-09 08:13:02 -05:00
Kitware Robot
98103e38d0
CMake Nightly Date Stamp
2019-01-09 00:01:04 -05:00
Brad King
68bc9fcbb9
Merge branch 'vs2017-skip-2019' into release-3.13
...
Merge-request: !2775
2019-01-08 14:13:33 -05:00
Brad King
d44f81c217
VS: Exclude VS 2019 instances when using VS 2017 generator
...
Filter instances reported by the VS Installer to consider only VS 2017
instances for the "Visual Studio 15 2017" generator.
Fixes : #18721
2019-01-08 14:10:16 -05:00
Kyle Edwards
6a796b57b2
Merge topic 'modernize-for'
...
1cf9c754db Source: Modernize for loops, add const modifiers
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2765
2019-01-08 09:55:47 -05:00
Tim Blechmann
200bf57742
BundleUtilities: Ensure target dir exists when creating symlinks
...
Commit v3.13.0-rc1~279^2 (GetPrerequisites: Move dylibs from MacOS
to Frameworks folder in bundle, 2018-07-22) introduced a regression
that can cause symlink creation to fail during packaging. Symlinks
can be created before targets are installed, so the destination
directory of the symlink sometimes won't exist at symlink creation.
Fixes : #18726
2019-01-08 19:56:34 +11:00
Kitware Robot
f5da1bb349
CMake Nightly Date Stamp
2019-01-08 00:01:05 -05:00
Craig Scott
5b7eb38e8e
Merge topic 'fix-warn-uninitialized-in-configure'
...
cbf0c0fce4 cmake: Enable --warn-uninitialized inside string(CONFIGURE) and configure_file
1d32a35c10 cmCommandArgumentParserHelper: use cmMakefile::MaybeWarnUninitialized
67ac4ed1dc cmMakefile: Move uninitialized vars logic into MaybeWarnUninitialized()
5257af3634 cmMakefile: move common logic to IsProjectFile function
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2676
2019-01-07 15:33:52 -05:00
Craig Scott
6f904d0100
Merge topic 'nmake-compile-commands'
...
37c6a02dc2 CMake: fix nmake compile_commands generation
7583f7490e cmGlobalGenerator: Teach EscapeJSON to escape newlines and tabs
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2648
2019-01-07 15:26:55 -05:00
Kitware Robot
c1e9b1c283
CMake Nightly Date Stamp
2019-01-07 00:01:06 -05:00
Craig Scott
99a0a6d816
Merge topic 'bundle_fixes'
...
08be74bfd7 GetPrerequisites: Fix handling of executable scripts
52445300d6 GetPrerequisites: Allow prefixed tools
1bac4678ea GetPrerequisites: Add GET_PREREQUISITES_VERBOSE to set verbose
5072598f07 BundleUtilites: Don't use hardcoded name for install_name_tool
428680da92 GetPrerequisites: Don't use hardcoded name for otool
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2748
2019-01-06 15:05:32 -05:00
Kitware Robot
d3e0e65de3
CMake Nightly Date Stamp
2019-01-06 00:01:04 -05:00
Kitware Robot
662ab10bc2
CMake Nightly Date Stamp
2019-01-05 00:01:05 -05:00
Alexander Grund
08be74bfd7
GetPrerequisites: Fix handling of executable scripts
...
Fixes : #18667
2019-01-05 09:09:39 +11:00
Craig Scott
f789441179
Merge topic 'remove-std-iterator'
...
1b135cdff2 cmLinkedTree: Remove deprecated std::iterator
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2767
2019-01-04 16:49:07 -05:00
Craig Scott
aaf7c94ddb
Merge topic 'get-ide-version-const'
...
77d83568e0 cmGlobalVisualStudioGenerator::GetIDEVersion(): const added
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2769
2019-01-04 16:47:01 -05:00
Marc Chevrier
e7a88ce482
Merge branch 'swig_src_file_ext' into 'master'
...
UseSWIG: Add support for custom Swig source file extensions
Closes #18727
See merge request cmake/cmake!2764
2019-01-04 05:16:41 -05:00
Kitware Robot
11fcecbaad
CMake Nightly Date Stamp
2019-01-04 00:01:04 -05:00
Kitware Robot
6b163fc6e5
CMake Nightly Date Stamp
2019-01-03 00:01:06 -05:00
Thirumal Venkat
9816748847
SWIG: Add support for custom Swig source file extensions
2019-01-03 09:36:15 +05:30
Craig Scott
124a8632cb
Merge topic 'messenger-no-cmstate-v2'
...
8a803d784b cmMessenger: Decouple from cmState
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2653
2019-01-02 15:31:39 -05:00
Vitaly Stakhovsky
77d83568e0
cmGlobalVisualStudioGenerator::GetIDEVersion(): const added
2019-01-02 08:25:49 -05:00
Kitware Robot
88f1e79f3e
CMake Nightly Date Stamp
2019-01-02 00:01:04 -05:00
Vitaly Stakhovsky
1b135cdff2
cmLinkedTree: Remove deprecated std::iterator
2019-01-01 16:51:50 -05:00
Kitware Robot
938e5c075a
CMake Nightly Date Stamp
2019-01-01 00:01:05 -05:00
Bruno Manganelli
8a803d784b
cmMessenger: Decouple from cmState
2019-01-01 11:55:08 +11:00
Craig Scott
124c741f7b
Merge topic 'add-override'
...
94632087b2 Add missing override
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2763
2018-12-31 17:12:38 -05:00
Craig Scott
a7dcf130e9
Merge topic 'gtest-discovery-work-dir'
...
3bbf77fa01 Specify WORKING_DIRECTORY to execute_process() in GoogleTestAddTests
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !2761
2018-12-31 17:07:13 -05:00
Vitaly Stakhovsky
1cf9c754db
Source: Modernize for loops, add const modifiers
2018-12-31 11:50:40 -05:00
Kitware Robot
f941320ba1
CMake Nightly Date Stamp
2018-12-31 00:01:04 -05:00
Alexander Grund
52445300d6
GetPrerequisites: Allow prefixed tools
...
e.g. for cross-compilation with e.g. x86_64-pc-linux-gnu-ldd
2018-12-31 11:56:40 +11:00
Alexander Grund
1bac4678ea
GetPrerequisites: Add GET_PREREQUISITES_VERBOSE to set verbose
2018-12-31 11:56:40 +11:00
Alexander Grund
5072598f07
BundleUtilites: Don't use hardcoded name for install_name_tool
2018-12-31 11:56:40 +11:00
Vitaly Stakhovsky
94632087b2
Add missing override
2018-12-30 12:32:55 -05:00
Alexander Grund
428680da92
GetPrerequisites: Don't use hardcoded name for otool
2018-12-30 15:08:49 +01:00
Kitware Robot
ae8525b82f
CMake Nightly Date Stamp
2018-12-30 00:01:05 -05:00
Craig Scott
c79b98af37
Merge topic 'remove-include-cmakeparsearguments'
...
88b40744b5 CMakeParseArguments: Remove superfluous includes of CMakeParseArguments
Acked-by: Kitware Robot <kwrobot@kitware.com >
Acked-by: Ben Boeckel <ben.boeckel@kitware.com >
Merge-request: !2744
2018-12-29 16:45:57 -05:00
Artur Ryt
cbf0c0fce4
cmake: Enable --warn-uninitialized inside string(CONFIGURE) and configure_file
...
Fixes : #18489
2018-12-30 08:31:09 +11:00
Artur Ryt
1d32a35c10
cmCommandArgumentParserHelper: use cmMakefile::MaybeWarnUninitialized
...
It removes logic duplication and need to have cached
WarnUninitialized and CheckSystemVars
2018-12-30 08:31:09 +11:00
Kitware Robot
3fe0b6f0ab
CMake Nightly Date Stamp
2018-12-29 00:01:04 -05:00
Artur Ryt
67ac4ed1dc
cmMakefile: Move uninitialized vars logic into MaybeWarnUninitialized()
2018-12-28 15:16:37 +01:00