Brad King
797196c8a7
Merge topic 'vs-sdk-refs'
...
efd0c013 VS: Fix VS_SDK_REFERENCES when target is not a Windows 10 app
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1166
2017-08-24 09:34:43 -04:00
Brad King
65ca67cef1
Merge topic 'boost-1.65'
...
fa114e7d FindBoost: Add Boost 1.65 dependencies
e66e8e89 BoostScanDeps: Special case python and numpy and variants
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1172
2017-08-24 09:34:22 -04:00
Brad King
94299c496d
Merge topic 'ninja-gfortran-fpreprocessed'
...
90a34ff7 Ninja: Fix references to source files in gfortran diagnostics
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1146
2017-08-24 09:33:55 -04:00
Brad King
061b4f24be
Merge topic 'ipo-test-output'
...
6756b552 Tests: Print more info on CheckIPOSupported test failure
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1177
2017-08-24 09:33:24 -04:00
Kitware Robot
fe19fda2aa
CMake Nightly Date Stamp
2017-08-24 00:01:11 -04:00
Roc Ramon
efd0c01337
VS: Fix VS_SDK_REFERENCES when target is not a Windows 10 app
...
Close the `<ItemGroup>` element whenever it is opened.
2017-08-23 15:43:46 -04:00
Raul Laasner
90a34ff791
Ninja: Fix references to source files in gfortran diagnostics
...
The Ninja generator preprocesses and compiles separately for Fortran.
When compiling, tell gfortran that the source is already preprocessed so
that it will honor the `# <line>` directives when producing diagnostics
messages.
Fixes : #17160
2017-08-23 15:32:44 -04:00
Brad King
fa664d9863
Merge topic 'FindCurses-wide'
...
72343d26 Help: Add notes for topic 'FindCurses-wide'
4b02afc0 FindCurses: Add option for ncursesw detection
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1161
2017-08-23 09:03:58 -04:00
Brad King
6756b552ee
Tests: Print more info on CheckIPOSupported test failure
2017-08-23 08:43:28 -04:00
Brad King
fc1aaf1432
Merge topic 'autogen-optimize-cleanup'
...
8e452e67 Remove AUTOGEN variables from cmSourceFile and cmMakefile
0f2e178f Autogen: Don't use cmMakefile::GetQtUiFilesWithOptions
13bb716f Autogen: Fix and extend SKIP_AUTOMOC test
727247c3 Autogen: Read skip files from makefile
1eb1b409 Autogen: Remove VS specific code exclusion
54ec2a8b Autogen: Initializer file type scanning optimizations
cf7b3b96 Autogen: Initializer optimizations and cleanups
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1171
2017-08-23 08:21:27 -04:00
Daniel Pfeifer
ac6660b671
Merge topic 'cxx11-unordered'
...
cbcfb79f Use C++11 unordered containers
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1174
2017-08-23 05:11:40 -04:00
Daniel Pfeifer
7526b1ed32
Merge topic 'cm_fallthrough'
...
e4aafbf5 Fix CM_FALLTHROUGH with -Wunused-parameter
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1170
2017-08-23 04:03:18 -04:00
Kitware Robot
5490d0e685
CMake Nightly Date Stamp
2017-08-23 00:01:09 -04:00
Daniel Pfeifer
cbcfb79f9c
Use C++11 unordered containers
2017-08-22 23:05:27 +02:00
Sebastian Holtermann
8e452e67e9
Remove AUTOGEN variables from cmSourceFile and cmMakefile
2017-08-22 19:10:32 +02:00
Sebastian Holtermann
0f2e178f65
Autogen: Don't use cmMakefile::GetQtUiFilesWithOptions
...
The purpose of this patch is to allow later removal of
AUTOGEN specific variables in cmMakefile and cmSourceFile.
2017-08-22 19:10:32 +02:00
Sebastian Holtermann
13bb716f04
Autogen: Fix and extend SKIP_AUTOMOC test
2017-08-22 19:10:31 +02:00
Sebastian Holtermann
727247c316
Autogen: Read skip files from makefile
...
This allows to pass SKIP_AUTOMOC hints to the
FOO_autogen target from files that are not listed
in the target sources.
The problem was that if main.cpp was listed in the source
but not main.h, then SKIP_AUTOMOC for main.h was ignored.
2017-08-22 18:43:34 +02:00
Sebastian Holtermann
1eb1b409c2
Autogen: Remove VS specific code exclusion
...
The amount of disabled code was small.
Also the #ifdef tests were confusing and made
testing on non Windows machines more difficult.
2017-08-22 18:43:34 +02:00
Roger Leigh
fa114e7d70
FindBoost: Add Boost 1.65 dependencies
2017-08-22 17:03:36 +01:00
Roger Leigh
e66e8e8914
BoostScanDeps: Special case python and numpy and variants
2017-08-22 17:03:35 +01:00
Sebastian Holtermann
54ec2a8bcf
Autogen: Initializer file type scanning optimizations
2017-08-22 17:13:59 +02:00
Sebastian Holtermann
cf7b3b9671
Autogen: Initializer optimizations and cleanups
2017-08-22 17:13:59 +02:00
Brad King
72343d2604
Help: Add notes for topic 'FindCurses-wide'
2017-08-22 10:44:18 -04:00
Alexandr (Sagrer) Gridnev
4b02afc0ca
FindCurses: Add option for ncursesw detection
...
This is a remake of the patch from issue #10347 but based on current
master. Works for me on Lubuntu 17.04.
Fixes : #10347
2017-08-22 10:42:20 -04:00
Brad King
8a0ed37f61
Merge topic 'ccg-no-mutable'
...
52527468 cmCustomCommandGenerator: Avoid mutable state
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1145
2017-08-22 08:27:04 -04:00
Brad King
6b37d69cdb
Merge topic 'cmake-ice37-2'
...
d0a20d29 FindIce: Add support for separate Freeze NuGet package
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1152
2017-08-22 08:26:44 -04:00
Brad King
33cf8e415f
Merge branch 'release-3.9'
2017-08-22 08:25:32 -04:00
Brad King
86a5b97fe8
Merge topic 'InstallRequiredSystemLibraries-vs15.3'
...
23cf9e15 InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directory
b45d8432 InstallRequiredSystemLibraries: Factor redist name into variable
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1168
2017-08-22 08:24:14 -04:00
Brad King
d3d0191dcd
Merge topic 'revert-macos-hidpi-qt-dialog'
...
286c75f7 macOS: Revert default Hi-DPI support in applications
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1167
2017-08-22 08:21:03 -04:00
Brad King
e4aafbf596
Fix CM_FALLTHROUGH with -Wunused-parameter
...
Fix the test code that we `try_compile` to avoid unused parameter
warnings that cause the check to fail.
2017-08-22 08:13:30 -04:00
Brad King
02645aa6ae
Merge branch 'InstallRequiredSystemLibraries-vs15.3' into release-3.9
...
Merge-request: !1168
2017-08-22 07:30:30 -04:00
Brad King
3f17ccce1c
Merge branch 'revert-macos-hidpi-qt-dialog' into release-3.9
...
Merge-request: !1167
2017-08-22 07:30:20 -04:00
Brad King
286c75f7f0
macOS: Revert default Hi-DPI support in applications
...
This reverts commit v3.9.0-rc1~287^2 (macOS: Enable Hi-DPI support in
applications by default, 2017-04-08). It breaks iOS applications that
do not use their own `MACOSX_BUNDLE_INFO_PLIST` because `NSApplication`
is only for macOS apps. Until more complete support for iOS is added
to CMake (e.g. with a different default plist file) we must allow
our default plist file to work for both macOS and iOS.
Fixes : #17179
2017-08-22 07:29:20 -04:00
Kitware Robot
2d41ec5036
CMake Nightly Date Stamp
2017-08-22 00:01:08 -04:00
Brad King
23cf9e152f
InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directory
...
Add compiler version 19.11 to our table.
Fixes : #17184
2017-08-21 11:59:33 -04:00
Brad King
b45d8432c2
InstallRequiredSystemLibraries: Factor redist name into variable
...
Store the `VC###` component of the `Microsoft.VC###.CRT` directory name
in a variable set based on the toolchain version. Its naming convention
is changed by VS 15.3.
2017-08-21 11:59:31 -04:00
Craig Scott
9a0a6f91ae
Merge topic 'perf-targetIter-missedGenerators'
...
7bc65770 Performance: Fix a few more unnecessary vector copies missed in af3fd6f
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1157
2017-08-21 09:13:59 -04:00
Brad King
b14fdea3a6
Merge topic 'cpack-extend-test-capabilities'
...
80047bd6 CPack: extend testing framework
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1162
2017-08-21 09:03:00 -04:00
Brad King
ab5667b516
Merge topic 'autogen-macro-names'
...
b3d98c6e Autogen: Add release notes for AUTOMOC_MACRO_NAMES
7529d84f Autogen: Add documentation for AUTOMOC_MACRO_NAMES
05891d8f Autogen: Add test for AUTOMOC_MACRO_NAMES
93f0ba28 Autogen: Add AUTOMOC_MACRO_NAMES support
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1156
2017-08-21 09:02:09 -04:00
Brad King
fabb217502
Merge topic 'bootstrap-target-commands'
...
ef978c1d CursesDialog: use target_include_directories for cmForm
7814d750 bootstrap: make target_* commands available
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1158
2017-08-21 09:00:09 -04:00
Brad King
d46300be89
Merge topic 'vs-less-c_str'
...
79064819 VS: remove unnecessary c_str()
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1151
2017-08-21 08:58:39 -04:00
Brad King
037beeddd1
Merge topic 'findcuda_dont_quote_COMPILE_DEFINITIONS'
...
c1f4f13d FindCUDA: Use long brackets to handle spaces in CUDA_NVCC_COMPILE_DEFINITIONS
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1139
2017-08-21 08:56:56 -04:00
Brad King
e37cdb385a
Merge topic 'bootstrap'
...
d12837af bootstrap: Require a standard C compiler
dc0befb6 bootstrap: Remove check that identifies GNU compiler
6fdcf02a bootstrap: remove dead branches
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1142
2017-08-21 08:55:11 -04:00
Brad King
774d649126
Merge topic 'bootstrap-grep-solaris'
...
e488c7f9 bootstrap: Restore output redirection instead of "grep -q"
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1144
2017-08-21 08:51:06 -04:00
Brad King
c1f3eb9f2d
Merge topic 'require-c++11'
...
fd4fd9a2 Require C++11 to build CMake itself
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1132
2017-08-21 08:48:24 -04:00
Kitware Robot
a1b84ac2a6
CMake Nightly Date Stamp
2017-08-21 00:01:07 -04:00
Kitware Robot
4f9ce1aeca
CMake Nightly Date Stamp
2017-08-20 00:01:06 -04:00
Craig Scott
bb3647060c
Merge topic 'typo_doc_if_command'
...
b9ed29b7 Help: Fix formatting typo for the 'if' command
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1155
2017-08-19 17:15:41 -04:00
Domen Vrankar
80047bd611
CPack: extend testing framework
...
Some CPack tests require running
commands after the inclusion of
CPack.cmake and this patch enables
such tests to declare run_after_include_cpack
function which is run after the
inclusion.
2017-08-19 22:41:14 +02:00