Commit Graph

34788 Commits

Author SHA1 Message Date
Michael Maltese eacf7decbf GetPrerequisites: also try to resolve just the basename
Fixes #16625.
2017-02-22 12:27:39 -08:00
Brad King 3ccad39000 Merge topic 'cmake-host-system-name'
717e1f30 Use looked up uname path for command execution
0bbd993f Make CMAKE_HOST_SYSTEM_NAME available in scripting context
2017-02-21 11:14:03 -05:00
Brad King f5d6d27168 Merge topic 'FindGTK2-old-sigc++'
2ab118a8 FindGTK2: handle old libsigc++ versions
2017-02-21 11:14:01 -05:00
Brad King 48ef9c5ae6 Merge topic 'cuda-separable-bool'
08fa0b45 CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATION
2017-02-21 11:13:58 -05:00
Kitware Robot 8209b3238f CMake Nightly Date Stamp 2017-02-21 00:01:03 -05:00
Brad King 08fa0b4595 CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATION
If the property is explicitly set to a non-true value we should
not treat it as true.
2017-02-20 17:05:35 -05:00
Ben Boeckel 2ab118a859 FindGTK2: handle old libsigc++ versions
Old versions of `libsigc++` do not have the version macros inside of its
`sigc++config.h` header. Assume nothing about such headers and report
version "zero".

Fixes: #16654
2017-02-20 11:58:57 -05:00
Brad King 3c0de6db2d Merge topic 'iwyu'
d58d28a9 ParserHelper: Move macros to bottom of files
07953c18 remove file cmStandardIncludes.h
f918b053 cmFortranParser: include what you use
b74314c6 cmDependsJavaParser: include what you use
74404df4 cmCommandArgumentParser: include what you use
e7168c08 cmExprParser: include what you use
ee72803e fix some include-what-you-use diagnostics
2017-02-20 10:43:07 -05:00
Brad King 66094d1224 Merge topic 'productbuild_component_plist'
d32f9deb CPack: Add option to specify --component-plist for productbuild
2017-02-20 10:43:05 -05:00
Brad King 5d17b68c67 Merge topic 'productbuild_resources'
734581f4 CPack: Add support for CPACK_PRODUCTBULID_RESOURCES_DIR
2017-02-20 10:43:02 -05:00
Brad King 168420f35c Merge topic 'fix-CMAKE_ROOT-case'
3287ba02 Make CMAKE_ROOT independent of case of path used to invoke cmake
2017-02-20 10:43:00 -05:00
Brad King 53a1ec631d Merge topic 'fix-CMP0017-path-case'
e2d78f75 Windows: Fix inconsistent behavior on changes to case of path to cmake
2017-02-20 10:42:57 -05:00
Daniel Pfeifer d58d28a941 ParserHelper: Move macros to bottom of files
Since the class name is used in the macros, the iwyu tool gets confused
wheter it needs a forward declaration or not.

While editing the files, make sure structs have no typedef.  Also,
remove confusing comments about Java.
2017-02-20 10:35:55 -05:00
Daniel Pfeifer 07953c18f3 remove file cmStandardIncludes.h 2017-02-20 10:35:55 -05:00
Daniel Pfeifer f918b053b2 cmFortranParser: include what you use 2017-02-20 10:35:55 -05:00
Kitware Robot d36016a8ff CMake Nightly Date Stamp 2017-02-20 00:01:02 -05:00
Gregor Jasny 717e1f3056 Use looked up uname path for command execution 2017-02-19 19:27:34 +01:00
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
Daniel Pfeifer b74314c6fd cmDependsJavaParser: include what you use 2017-02-17 22:12:21 +01:00
Daniel Pfeifer 74404df440 cmCommandArgumentParser: include what you use 2017-02-17 22:12:21 +01:00
Daniel Pfeifer e7168c087f cmExprParser: include what you use 2017-02-17 22:12:21 +01:00
Daniel Pfeifer ee72803e9f fix some include-what-you-use diagnostics 2017-02-17 22:12:21 +01:00
Tim Hutt 734581f49f CPack: Add support for CPACK_PRODUCTBULID_RESOURCES_DIR
This allows you to copy custom files (e.g. a background image) into the
macOS installer.

Fixes: #16604
2017-02-17 11:47:00 -05:00
Tim Hutt d32f9debc8 CPack: Add option to specify --component-plist for productbuild
When using the productbuild generator this lets you specify the value of
the `--component-plist` parameter when it runs pkgbuild for a component.

Fixes: #16638
2017-02-17 11:40:45 -05:00
Brad King e2d78f7535 Windows: Fix inconsistent behavior on changes to case of path to cmake
In commit v3.4.0-rc1~333^2 (Merge branch 'upstream-kwsys' into
update-kwsys, 2015-07-15) we brought in upstream KWSys commit 86a24794
(SystemTools: Fix GetActualCaseForPath drive letter case handling,
2015-07-09).  This caused our path processing to convert drive letters
to upper-case and exposed an existing bug in our implementation of
CMP0017.

Policy CMP0017 is responsible for ensuring that modules included from a
builtin module only load other builtin modules and cannot be overridden
by a file in `CMAKE_MODULE_PATH`.  If there is a case difference in the
drive letter (or other path components) then the path to the including
module may not match our builtin module directory in a simple string
comparison.  This means builtin modules may not be recognized as such,
and they may not reliably include their builtin dependencies.  For
example, if a project provides a `Platform/Windows` module in
`CMAKE_MODULE_PATH` it can break inclusion of our builtin
`Platform/Windows` module, leading to strange behavior.

Fix this by comparing the path to the including module to our builtin
module directory using a function that is aware of case-insensitivity of
paths on Windows.

Fixes: #16648, #16622
2017-02-17 11:10:45 -05:00
Brad King 3287ba0254 Make CMAKE_ROOT independent of case of path used to invoke cmake
We compute the location of `CMAKE_ROOT` and other resources relative to
the location of our own executable.  On some platforms this path is
computed in a way that depends on the case of the path used to invoke
the executable.  Convert the result to the actual case preserved by the
filesystem on disk in order to make it consistent regardless of how the
executable is launched.

This approach generalizes the fix made by commit v3.8.0-rc1~71^2
(cmSystemTools: use the actual case for root detection, 2017-01-18).

Issue: #16648
2017-02-17 11:09:12 -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