Commit Graph

36023 Commits

Author SHA1 Message Date
Brad King
3e41abbda1 Utilities/Release: Switch macOS binary to Qt 5.6.2
Update from 5.6.0.
2017-05-17 09:38:42 -04:00
Kitware Robot
3f25f873f8 CMake Nightly Date Stamp 2017-05-17 00:01:05 -04:00
Brad King
6b05e028f1 Merge branch 'release' 2017-05-16 11:33:02 -04:00
Brad King
e69e4448fb Merge topic 'xcode-try_compile-scheme'
c608000a Xcode: Work around xcodebuild spurious hangs in try_compile
b8e707a6 Xcode: Refactor internal decision for scheme generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !850
2017-05-16 09:57:47 -04:00
Brad King
8475734cb3 Merge topic 'early-config-name'
eeb47fbe cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !848
2017-05-16 09:55:51 -04:00
Brad King
ef8ac5ad5a Merge topic 'cpackifw-i18n'
72ac7ad9 CPackIFW: Internationalization Support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !748
2017-05-16 09:55:29 -04:00
Brad King
0789a8be08 Merge topic 'extra-fphsa-space'
3c515e19 FPHSA: remove extra space

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !843
2017-05-16 09:54:09 -04:00
Brad King
80e0ef4082 Merge topic 'GNU-FindBinUtils-patterns'
75accaae GCC: more patterns for ar/ranlib

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !838
2017-05-16 09:53:32 -04:00
Brad King
67d5593efa Merge topic 'mingw-w64-compile'
9557b403 cmFileCommand: Fix build on mingw-w64
845f5e3c bootstrap: fix build on mingw-w64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !837
2017-05-16 09:52:42 -04:00
Brad King
252c2f5ee2 Merge topic 'vs_fix_cpp_debugging_with_cs_enabled'
a6b39a5a VS: Fix debugging of C++ executables if CSharp is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !844
2017-05-16 09:51:51 -04:00
Brad King
300979e788 Merge topic 'FindOpenSSL-crypto-only'
8b410453 FindOpenSSL: Restore support for crypto-only result

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !846
2017-05-16 09:49:05 -04:00
Brad King
46f48467c5 Merge topic 'FindDevIL-compat'
e8f0385f FindDevIL: Restore IL_FOUND result variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !845
2017-05-16 09:47:50 -04:00
Kitware Robot
1867856f6a CMake Nightly Date Stamp 2017-05-16 00:01:05 -04:00
Brad King
4fd61a60f1 Merge branch 'mingw-w64-compile' into release 2017-05-15 14:26:55 -04:00
Aleksey Chernov
9557b403f5 cmFileCommand: Fix build on mingw-w64
Include header needed for `CP_ACP`.
2017-05-15 14:25:37 -04:00
Brad King
c608000a2a Xcode: Work around xcodebuild spurious hangs in try_compile
`xcodebuild` occasionally hangs on some macOS machines (and can be
reproduced independent of CMake).  It only happens a few times in 1000
runs, but configuration of a large project calls `try_compile` many
times and therefore frequently hangs due to this problem.  I've been
unable to reproduce the hang when using a scheme to build, so always
generate a scheme in `try_compile` projects to work around the problem.

Issue: #16752
2017-05-15 13:05:46 -04:00
Brad King
b8e707a6a1 Xcode: Refactor internal decision for scheme generation
Move the Xcode version check out to wrap everything.
2017-05-15 13:02:09 -04:00
Brad King
eeb47fbeb2 cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction
Copy the value to our `ConfigName` member on construction to ensure it
is available even to code paths that run before `Generate`.  We once
needed to delay this lookup until `Generate` because the local
generators were at one time created before `Configure`.  Now they are
created at generate time which is late enough to expect
`CMAKE_BUILD_TYPE` to be available.

Without this, `cmGlobalUnixMakefileGenerator3::WriteConvenienceRules`
causes use of `ConfigName` before it is populated which breaks use of
source files that depend on the `$<CONFIG>` generator expression.

Fixes: #16889
2017-05-15 11:51:57 -04:00
Aleksey Chernov
845f5e3c51 bootstrap: fix build on mingw-w64
Define the default code page for EncodingCXX too.
2017-05-15 11:13:07 -04:00
Brad King
7ab585dbc2 Merge branch 'vs_fix_cpp_debugging_with_cs_enabled' into release 2017-05-15 11:02:43 -04:00
Michael Stürmer
a6b39a5adf VS: Fix debugging of C++ executables if CSharp is enabled
Fixes: #16867
2017-05-15 11:02:15 -04:00
Brad King
4717797647 Merge topic 'fix-target-alias-doc-typo'
6a6cbd47 Help: Fix typo in add_library(... ALIAS ...) text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !840
2017-05-15 10:57:41 -04:00
Brad King
dd89b24b9b Merge topic 'autogen_settings'
b95fbbe5 Autogen: Add -DWIN32 to definitions list on demand
ab39dd11 Autogen: Include moc/uic/rcc binary in settings hash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !836
2017-05-15 10:57:20 -04:00
Brad King
bedd098a65 Merge topic 'cpack-components-handle-symlinks'
26384068 CPack test symlinks in package
6949b71f CPack unify component/monolithic package symlink handling
3eb0f080 Improved CPack tests error logging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !841
2017-05-15 10:55:58 -04:00
Brad King
cda0baea49 Merge topic 'FindPkgConfig-fix-lib-search'
2e293c39 FindPkgConfig: Fix pkg_check_modules() non-standard location search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !835
2017-05-15 10:55:10 -04:00
Brad King
9f2a68ac9b Merge branch 'FindOpenSSL-crypto-only' into release 2017-05-15 10:14:56 -04:00
Brad King
8b41045393 FindOpenSSL: Restore support for crypto-only result
Since commit v3.8.0-rc1~132^2 (FindOpenSSL: Check that both CRYPTO and
SSL libraries are present, 2017-01-03) we require both crypto and ssl
libraries to be present.  This makes sense because `OPENSSL_LIBRARIES`
lists both and breaks when one is not found.  However, prior to that
fix we supported finding only the crypto library and using it through
the imported target.  Drop the requirement for ssl to restore support
for using crypto alone.

Later this module should be taught to support the `COMPONENTS` argument
of `find_package`.

Fixes: #16882
2017-05-15 10:12:46 -04:00
Brad King
6bcb198023 Merge branch 'FindDevIL-compat' into release 2017-05-15 09:57:03 -04:00
Brad King
e8f0385f41 FindDevIL: Restore IL_FOUND result variable
The fix in commit v3.8.0-rc1~257^2~1 (FindDevIL: fail properly when
library is not found, 2016-11-24) removed the previously-provided
`IL_FOUND` result variable.  Set it for compatibility and update the
documentation to mention the new variable.

Fixes: #16881
2017-05-15 09:56:41 -04:00
Ben Boeckel
3c515e1922 FPHSA: remove extra space
Each missing variable is added to the string as " ${var}" which causes
the string to always have a leading space. Remove the duplicate space
due to this in the output.
2017-05-15 09:23:29 -04:00
Kitware Robot
52fbae0a59 CMake Nightly Date Stamp 2017-05-15 00:01:03 -04:00
Domen Vrankar
2638406813 CPack test symlinks in package 2017-05-14 23:45:18 +02:00
Domen Vrankar
6949b71ff1 CPack unify component/monolithic package symlink handling
Non component package generation was recursing through
symlinks while monolithic package generation did not.
This was causing component archive packages to contain
both symlink and a directory with the same name on the
same level if symlink contained files which caused errors
during extraction of such packages.

Closes #16051
2017-05-14 23:45:18 +02:00
Domen Vrankar
3eb0f08084 Improved CPack tests error logging 2017-05-14 23:45:18 +02:00
Gregor Jasny
6a6cbd47fb Help: Fix typo in add_library(... ALIAS ...) text 2017-05-14 22:09:19 +02:00
Ruslan Baratov
75accaae8b GCC: more patterns for ar/ranlib 2017-05-14 12:31:26 +03:00
Kitware Robot
0816ebcc07 CMake Nightly Date Stamp 2017-05-14 00:01:04 -04:00
Sebastian Holtermann
b95fbbe553 Autogen: Add -DWIN32 to definitions list on demand 2017-05-13 10:25:46 +02:00
Sebastian Holtermann
ab39dd11f5 Autogen: Include moc/uic/rcc binary in settings hash 2017-05-13 10:14:23 +02:00
Kitware Robot
9d5fecde6a CMake Nightly Date Stamp 2017-05-13 00:01:09 -04:00
Konstantin Podsvirov
72ac7ad98d CPackIFW: Internationalization Support
Changes:
- DISPLAY_NAME and DESCRIPTION in CPackIFW module now is MULTI_ARGS;
- Added internationalization support for DisplayName and Description
  properties in cmCPackIFWPackage class;
- Added documentation to CPackIFW module;
- Added release note.
2017-05-13 02:34:15 +03:00
Yuriy Khokhulya
2e293c39da FindPkgConfig: Fix pkg_check_modules() non-standard location search
During search of the library file `pkg_check_modules()` attempts to find
it in last specified library path in `${_prefix}_LDFLAGS`, that after
dependency resolving contains path to standard location.

So in case when `${_prefix}_LDFLAGS` has:

    -L/prefix;-L/usr/local/lib;-llibrary_from_prefix;-ldependency

`library_from_prefix` will not be found.

As solution need try to find the library in all paths preceding to the
library.

Fixes: #16873
2017-05-12 09:21:21 -04:00
Brad King
836cb52e9a Merge topic 'command-name'
a1218f59 cmCommand: remove unused methods from interface and all implementations
4ba25a82 cmState: separate builtin and scripted commands
a44dab46 cmState: introduce method for adding scripted commands
c734c850 CTest: use new methods for builtin commands
bd14e464 cmCommands: use new methods for builtin commands
58708405 cmState: introduce methods for adding builtin commands
a890ca2f cmakemain: use script role for -P

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !829
2017-05-12 09:13:51 -04:00
Brad King
793b223c02 Merge topic 'getprerequisites-fix'
e0e414d6 GetPrerequisites: Only recurse on resolved unseen prerequisites

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !804
2017-05-12 09:13:37 -04:00
Brad King
592206a157 Merge topic 'add_cuda_cxx14_flag'
036ffe81 CUDA: Add support for the C++14 standard flag.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !830
2017-05-12 09:13:19 -04:00
Brad King
040de18b36 Merge topic 'sunpro-c-features'
5d13fe28 Features: Record features for SunPro C 5.13 and 5.14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !832
2017-05-12 09:12:48 -04:00
Brad King
8843120ded Merge topic 'update-curl'
95d3ebcc curl: Set TLS/SSL build options the way we need for CMake
11ba72c6 curl: Skip building docs within CMake
29997590 Merge branch 'upstream-curl' into update-curl
fd7d521c curl 2017-04-19 (d957e218)
5af9c8e2 curl: Update script to get curl 7.54.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !828
2017-05-12 09:12:29 -04:00
Brad King
9ab81c4a9b Merge topic 'lexerparser-fix-bootstrap'
e1e8f27f bootstrap: fix Bad substitution

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !831
2017-05-12 09:11:56 -04:00
Kitware Robot
91d987e15c CMake Nightly Date Stamp 2017-05-12 00:01:04 -04:00
Guillaume Dumont
e0e414d659 GetPrerequisites: Only recurse on resolved unseen prerequisites
I encountered an issue where not all prerequisites would be listed by
`get_prerequisites` since some of the prerequisites cannot be resolved
and are added to the list of unseen prerequisites.  This has the side
effect of clearing the list of `prerequisites_var` and thus removes some
prerequisites from the list.  Fix it.
2017-05-11 16:12:38 -04:00