34763 Commits

Author SHA1 Message Date
Gregor Jasny
0bbd993f61 Make CMAKE_HOST_SYSTEM_NAME available in scripting context 2017-02-19 19:27:34 +01:00
Kitware Robot
96b6afdc42 CMake Nightly Date Stamp 2017-02-19 00:01:03 -05:00
Kitware Robot
74e83c5ff5 CMake Nightly Date Stamp 2017-02-18 00:01:03 -05:00
Brad King
dbdd25bc95 Merge topic 'FindHDF5-fix-header-langs'
96d61393 FindHDF5: Fix search for language-specific header file
2017-02-17 09:32:57 -05:00
Brad King
96d6139386 FindHDF5: Fix search for language-specific header file
Refactoring in commit v3.6.0-rc1~85^2 (HDF5: Refactor the use of
compiler wrappers, 2016-04-04) converted code of the form

    if(${LANGUAGE} MATCHES ...)

to

    if(LANGUAGE MATCHES ...)

However, `LANGUAGE` is a foreach() loop variable and not a normal
variable so auto-dereference does not occur.  Restore the explicit `${}`
syntax and use the new name of the loop variable that has changed since
then too.

Fixes: #16651
2017-02-17 09:25:46 -05:00
Brad King
c58b0926a7 Merge topic 'FindHDF5-include-dir-advanced'
28bb68e3 FindHDF5: Restore HDF5_<LANG>_INCLUDE_DIR advanced cache entry mark
2017-02-17 09:18:44 -05:00
Brad King
28bb68e347 FindHDF5: Restore HDF5_<LANG>_INCLUDE_DIR advanced cache entry mark
Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching
to correctly find HL for all bindings, 2016-05-12) renamed the language
loop variable used to construct the name of `HDF5_<LANG>_INCLUDE_DIR`
but forgot to update it in the `mark_as_advanced` call.  Fix it now.

Issue: #16651
2017-02-17 09:10:03 -05:00
Brad King
f3e8a89a9b Merge topic 'install_name_policy'
1ba91291 Add policy CMP0068 separate install_name and RPATH settings on macOS
f7b9bf41 Apple: Add BUILD_WITH_INSTALL_NAME_DIR target property
4bff2d14 Apple: Refactor support for using INSTALL_NAME_DIR.
624fb9d7 Help: Format BUILD_WITH_INSTALL_RPATH documentation
2017-02-17 08:46:14 -05:00
Brad King
988c63527d Merge topic 'bison3'
761ea205 cmCommandArgumentParser: reformat grammar
1728b9c0 cmDependsJavaParser: Port to bison 3
fe75e140 cmCommandArgumentParser: Port to bison 3
2017-02-17 08:46:11 -05:00
Brad King
5febec7a4b Merge topic 'FindOpenSSL-crypto-name'
9b78dca3 FindOpenSSL: Add another name for libcrypto with MSVC
2017-02-17 08:46:03 -05:00
Brad King
261b5785ad Merge topic 'capture-ctest_update-svn-failures'
f10b2f72 ctest_update: Capture failure of svn to load revisions and local mods
ef399f9b ctest_update: Refactor internal APIs to support more failure cases
2017-02-17 08:45:36 -05:00
Kitware Robot
b6c9a851cb CMake Nightly Date Stamp 2017-02-17 00:01:02 -05:00
Daniel Pfeifer
761ea20518 cmCommandArgumentParser: reformat grammar 2017-02-16 21:34:27 +01:00
Daniel Pfeifer
1728b9c076 cmDependsJavaParser: Port to bison 3
Use %-directives to specify the scanner/lexer arguments and update the
yyerror signature.  Reduce the list of post-bison modifications needed.
2017-02-16 21:26:36 +01:00
Daniel Pfeifer
fe75e140d6 cmCommandArgumentParser: Port to bison 3
Use %-directives to specify the scanner/lexer arguments and update the
yyerror signature.  Reduce the list of post-bison modifications needed.
2017-02-16 21:18:15 +01:00
Brad King
c508fd8481 Merge branch 'release' 2017-02-16 13:35:45 -05:00
Brad King
1f9c879759 Merge branch 'release-3.7' 2017-02-16 13:35:40 -05:00
Kevin Whitaker
9b78dca3a9 FindOpenSSL: Add another name for libcrypto with MSVC
Add the `crypto` name without any prefix or suffix as a fallback, just
as we already have for `ssl`.
2017-02-16 13:26:42 -05:00
Brad King
f10b2f72f6 ctest_update: Capture failure of svn to load revisions and local mods
Issue: #16646
2017-02-16 13:19:26 -05:00
Brad King
ef399f9bc6 ctest_update: Refactor internal APIs to support more failure cases
Thread failure of VC tool commands through more APIs so that we can
detect when they fail.  Defer updating of the individual VC tool usage
the future and just return true from them for now.
2017-02-16 13:19:26 -05:00
Brad King
bb4730dc5a Merge topic 'vs-refactor-unknown-flags'
109b8a6f VS: Refactor AdditionalOptions generation
bd5ea699 cmVisualStudioGeneratorOptions: Add PrependInerhitedString method
3936a288 cmIDEOptions: Add SpaceAppendable flag table type
2017-02-16 13:15:52 -05:00
Brad King
160083b04d Merge topic 'vs-refactor-toolset-parsing'
f773933f VS: Refactor generator toolset parsing
d9e2b9a9 Tests: Split out RunCMake.GeneratorToolset Xcode checks
2017-02-16 13:15:49 -05:00
Brad King
fb3fd78d58 Merge topic 'TestBigEndian-cxx-only'
ac0962ce TestBigEndian: Fix to work with CXX without C
2017-02-16 13:15:47 -05:00
Brad King
60b5616af7 Merge topic 'command-cleanup-fix'
20ae76b1 cmDisallowedCommand: Forward final pass too
2017-02-16 13:15:44 -05:00
Brad King
aa18d5befe Merge topic 'fix-ctest_update-svn'
51849bba ctest_update: Fix svn log and external loading
2017-02-16 13:15:42 -05:00
Brad King
5d5be3bd96 Merge topic 'autogen_fix_3.8'
28ee3784 Autogen: Fix headers not skipped
2017-02-16 13:15:38 -05:00
Brad King
d1530cc9a5 Merge topic 'cuda-msvc-flags'
55fb46d2 CUDA: Fix default compiler flags on Windows
d7c80f60 CUDA: Fix test cases to not override CUDA flags
2017-02-16 13:15:35 -05:00
Kitware Robot
b9229944cf CMake Nightly Date Stamp 2017-02-16 00:01:10 -05:00
Brad King
2c354f4ee4 Merge branch 'autogen_fix_3.8' into release 2017-02-15 15:16:17 -05:00
Uwe Koloska
ac0962cead TestBigEndian: Fix to work with CXX without C 2017-02-15 15:08:37 -05:00
Sebastian Holtermann
28ee378405 Autogen: Fix headers not skipped 2017-02-15 21:00:39 +01:00
Brad King
93737d8012 Merge branch 'fix-ctest_update-svn' into release 2017-02-15 14:45:40 -05:00
Brad King
efac65d67b Merge branch 'fix-ctest_update-svn' into release-3.7 2017-02-15 14:45:31 -05:00
Brad King
51849bbab8 ctest_update: Fix svn log and external loading
Since commit v3.7.0-rc1~132^2 (CTestSVN: Fix segfault when
CTEST_UPDATE_VERSION_ONLY is enabled, 2016-09-12) we do not properly
extract svn log or externals.  After updating we erase the information
that was loaded before updating and can no longer log the changes
between revisions to extract authors.

Fix this by only loading the repository information once, whether needed
by `NoteOldRevision`, `NoteNewRevision`, or both.

Fixes: #12630, #16646
2017-02-15 14:44:37 -05:00
Brad King
ac7489e03c Merge branch 'cuda-msvc-flags' into release 2017-02-15 11:12:48 -05:00
Brad King
55fb46d273 CUDA: Fix default compiler flags on Windows
Fix the default values of `CMAKE_CUDA_FLAGS[_<CONFIG>]` on Windows to
make the host compiler flags match those produced for C++ by the
`Platform/Windows-MSVC` module.  This makes the flags consistent with
those used for C++.
2017-02-15 11:12:12 -05:00
Brad King
d7c80f6036 CUDA: Fix test cases to not override CUDA flags
Append to `CMAKE_CUDA_FLAGS` instead of overwriting it.
2017-02-15 11:12:09 -05:00
Brad King
109b8a6fd3 VS: Refactor AdditionalOptions generation
Store unknown flags directly in a flag map entry for `AdditionalOptions`
instead of having a separate member for them.  This avoids duplicating
the output generation logic for the entry.
2017-02-15 10:41:36 -05:00
Brad King
bd5ea6993c cmVisualStudioGeneratorOptions: Add PrependInerhitedString method 2017-02-15 10:37:35 -05:00
Brad King
3936a2886e cmIDEOptions: Add SpaceAppendable flag table type 2017-02-15 10:36:09 -05:00
Brad King
20ae76b1da cmDisallowedCommand: Forward final pass too
Refactoring in commit 7fb14775 (cmDisallowedCommand: extract policy
checking from cmCommand, 2016-12-26) introduced a wrapper for
disallowed commands that forwards to their original commands.
This broke the `export_library_dependencies` command that uses
a final pass.  Forward the final pass too to fix it.
2017-02-15 09:22:22 -05:00
Brad King
72cfb3c3d2 Merge branch 'release' 2017-02-15 08:25:35 -05:00
Brad King
8ff8766232 Merge topic 'vs-refactor-libs'
8ba6dc36 VS: Place CMAKE_<LANG>_STANDARD_LIBRARIES after other libraries
1d04d2ce VS: Refactor parsing of CMAKE_<LANG>_STANDARD_LIBRARIES
2017-02-15 08:24:13 -05:00
Brad King
6a5e5a9268 Merge topic 'vs-dedup-tag'
f7e5c682 VS: De-duplicate PreprocessorDefinitions tag name
2017-02-15 08:24:10 -05:00
Brad King
99ca1e27e2 Merge topic 'cuda-drop-comment'
7c29a0c8 CMakeDetermineCUDACompiler: Drop out-of-date comment
2017-02-15 08:24:07 -05:00
Brad King
e853dfed6a Merge topic 'cuda-with-c'
1c60231c CUDA: Link to standard system libraries when linking as CUDA
8d75d8dc Tests: Add case for CUDA with C but not C++
2017-02-15 08:24:05 -05:00
Brad King
8ba5c21db7 Merge topic 'cuda-no-Os'
59ed323d CUDA: Do not use non-existent -Os flag for nvcc
2017-02-15 08:24:02 -05:00
Brad King
75040fc103 Merge topic 'update-kwsys'
ff843dbd Merge branch 'upstream-KWSys' into update-kwsys
ced3396d KWSys 2017-02-14 (5c6f7836)
2017-02-15 08:24:00 -05:00
Brad King
f773933f26 VS: Refactor generator toolset parsing
We parse `CMAKE_GENERATOR_TOOLSET` values of the forms:

* `toolset`
* `toolset,host=x64`
* `host=x64`

Generalize the parsing to support the forms:

* `toolset`
* `toolset[,key=value]*`
* `key=value[,key=value]*`

Disallow duplicate keys.  Require all but the first field to
be of `key=value` form.
2017-02-15 08:15:37 -05:00
Brad King
d9e2b9a909 Tests: Split out RunCMake.GeneratorToolset Xcode checks
This will allow the behavior of VS and Xcode generators to differ.
2017-02-15 08:15:00 -05:00