Commit Graph

34834 Commits

Author SHA1 Message Date
Brad King 67a7e090f8 Merge branch 'vs15-GNUtoMS' into release 2017-05-22 14:52:57 -04:00
Alex Ghosh abe8a623d9 GNUtoMS: Add search path for VS 2017 environment scripts
Use `cmake_host_system_information` to query the VS Installer tool for
the locations of VS versions since VS 2017 does not provide registry
entries anymore.  Add a loop to simplify addition of future versions.
2017-05-22 14:52:05 -04:00
Brad King 1558f30cea Merge branch 'vs14-GNUtoMS' into release 2017-05-17 11:19:54 -04:00
Alex Ghosh c02d4d2aee GNUtoMS: Add search path for VS 2015 environment scripts 2017-05-17 11:19:23 -04:00
Brad King 93cadfc2b5 Merge branch 'source_group-TREE-relative-path' into release 2017-05-17 09:07:00 -04:00
Mateusz Janek 4716f2be83 source_group: Restore TREE support for relative paths
The fix in commit v3.8.1~4^2 (source_group: Fix TREE with root that is
not current source dir, 2017-04-20) accidentally broke support for
specifying paths relative to the source directory.  Fix it and add a
test covering the case.

While at it, fix a typo in a variable name.

Fixes: #16876
2017-05-17 09:04:02 -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
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 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
Brad King 8bd6af0d63 CMake 3.8.1 v3.8.1 2017-05-02 08:40:39 -04:00
Brad King 9a88708893 Merge branch 'FindMatlab-2017a' into release 2017-05-01 09:26:38 -04:00
Raffi Enficiaud 6f04dffb7d FindMatlab: Add support for Matlab 2017a 2017-05-01 09:26:32 -04:00
Brad King 341486fd09 Merge branch 'vs2017-sdk-detection' into release 2017-04-25 11:05:37 -04:00
Roger Leigh 0a29a31161 VS2017: Verify Windows 8.1 SDK before using it
The detection logic added by commit v3.8.0-rc2~14^2 (VS2017: If Win 8.1
SDK is not available, use Win 10 SDK, 2017-02-20) was incomplete.  It is
possible for the Win 8.1 SDK registry entry to exist, and even the
directory, but the header files to not actually be installed.  Teach
`cmGlobalVisualStudio15Generator::IsWin81SDKInstalled` to verify that
the `windows.h` header actually exists in the SDK directory.  We do this
in `cmGlobalVisualStudio14Generator::GetWindows10SDKVersion` for the
Windows 10 SDK already.

Fixes: #16811
2017-04-25 11:04:52 -04:00
Brad King bc71f940c7 Merge branch 'FindBoost-backport-fixes' into release 2017-04-24 10:54:54 -04:00
Roger Leigh 502608ab21 FindBoost: Support prebuilt Windows binaries from SourceForge
This are searched for in the default installed location
C:/local/boost_${ver}

Cherry picked from commit 862482df27
for backport to CMake 3.8.
2017-04-24 10:52:11 -04:00
Roger Leigh b479429b2c FindBoost: Allow testing for multiple compiler suffixes
This is to permit VS2017 to make use of the vc141 suffix or
fall back to the compatible vc140 to use Boost libraries built
with VS2015.

Cherry picked from commit 3ca6f70f8b
plus a fixup from commit 6115875bf0
for backport to CMake 3.8.
2017-04-24 10:52:01 -04:00
Brad King 92857eef23 FindBoost: Fix library directory for VS 2017
Boost 1.64 now names the library directory `14.1`, not `15.0`.
2017-04-24 10:51:08 -04:00
Brad King 627288fe23 Merge branch 'backport-source_group-TREE-alt-root' into release 2017-04-21 15:36:58 -04:00
Mateusz Janek 1b4d2c741a source_group: Fix TREE with root that is not current source dir
Also raise an error if files are given that are not below the root.

Fixes: #16807
2017-04-21 15:31:02 -04:00
Brad King df7590a2b9 Merge branch 'fix-test-all-find-modules' into release 2017-04-21 10:12:05 -04:00
Brad King cda401fec4 Tests: Simplify CMakeOnly.AllFindModules policy settings 2017-04-21 10:11:49 -04:00
Brad King 1a2ede1764 Tests: Fix FindModulesExecuteAll when KDE4 is installed
Set `CMP0017` to `NEW` so that when FindKDE4 sets `CMAKE_MODULE_PATH` it
does not break internal dependencies of other find modules.

Fixes: #16823
2017-04-21 10:11:10 -04:00
Brad King 08c99c9253 Merge branch 'cpack-rpm-buildrequires-docs' into release 2017-04-20 16:19:42 -04:00
Domen Vrankar 8b3693e466 CPack/RPM doc: CPACK_RPM_BUILDREQUIRES docs
Missing documentation for an already existing
CPackRPM source rpm packages feature.

Fixes #16814
2017-04-20 16:19:20 -04:00
Brad King 59224c3989 Merge branch 'fix-vs2017-guid-braces' into release 2017-04-20 10:31:14 -04:00
Richard Walters fd7e8f339a VS: Fix project reference inspection in VS IDE
The braces around project reference GUIDs for vcxproj projects were
apparently optional in the past, but Visual Studio 2017 is more strict,
displaying a warning, and not displaying project reference properties
unless the braces are present.

Fixes: #16820
2017-04-20 10:30:21 -04:00
Brad King b99fbf3b16 Merge branch 'FindBoost-fix-backslash-tolerance' into release 2017-04-19 11:28:08 -04:00
Alex Turbov 2516bccdf6 FindBoost: Restore tolerance of backslashes in paths
Since commit v3.8.0-rc1~136^2 (FindBoost: Search official location of
prebuilt binaries on Windows, 2016-12-21) we pass input paths through
`_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` in more
places than before.  This broke tolerance of backslashes in paths
provided by the user due to the macro argument re-parsing.  Turn
`_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` into a
function instead of macro to avoid re-parsing of macro arguments.

Fixes: #16816
2017-04-19 11:24:41 -04:00
Brad King f612719a77 Merge branch 'FindOpenSSL-more-precompiled' into release 2017-04-19 11:09:44 -04:00
Alex Turbov 16ef163fd6 FindOpenSSL: Add more library name alternatives
Add names found in OpenSSL 1.1.0 builds from [1].

[1] https://www.npcglib.org/~stathis/blog/precompiled-openssl/
2017-04-19 11:08:42 -04:00
Brad King da7833c5bb CMake 3.8.0 v3.8.0 2017-04-10 11:16:00 -04:00
Brad King a6a0cfb24d Merge branch 'vs-rc-defines' into release 2017-04-10 11:08:26 -04:00
Brad King 89b92a98a5 RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advanced
These were added by commit v3.8.0-rc4~4^2~1 (RC: Add missing
CMAKE_RC_FLAGS_<CONFIG> entries to cache, 2017-03-28) and should be
advanced as they are for other languages.
2017-04-10 11:07:14 -04:00
Brad King e265ddecfc Merge branch 'packaging-qtsdk' into release 2017-04-10 10:04:51 -04:00
Brad King 63a57d1bd9 Merge branch 'emulatorTargetPropertyDocs' into release 2017-04-10 09:58:57 -04:00
Brad King 07790796fc Merge branch 'clarifyFileGenerateDocs' into release 2017-04-10 09:58:52 -04:00
Craig Scott d039f7414f Help: Clarify file(GENERATE) only writes output file at generation phase
Closes: #16556
2017-04-10 09:58:22 -04:00
Brad King 07cc72502d Merge branch 'clarifyRemoveDocs' into release 2017-04-10 09:53:14 -04:00
Craig Scott 186dd8771e Help: Cross compile variable used as initial value for target property
Variable CMAKE_CROSSCOMPILING_EMULATOR is used to initialize
CROSSCOMPILING_EMULATOR.

Issue: #16785
2017-04-10 09:52:58 -04:00
Craig Scott 812274ff49 Help: Clarify what the -f option does for the remove command
Closes: #16784
2017-04-10 09:50:10 -04:00
Brad King 861f3465b4 Merge branch 'FindwxWidgets-new-syslibs' into release 2017-04-10 09:40:39 -04:00
Konstantin Podsvirov 94420a7b61 QtIFW: Improved packaging as part of the QtSDK
Changes:
- Fix install script template (*.qs.in) to register on all platforms;
- Add patch version numter to display name ("CMake X.Y" -> "CMake X.Y.Z").
2017-04-08 07:13:50 +03:00
Vadim Zeitlin ae4b3b7072 FindwxWidgets: link with the new required libs under MSW
Latest wxWidgets git master version and the upcoming 3.1.1 release requires
linking with shlwapi and version DLLs. As this does no harm when using the
previous versions, just do it unconditionally.
2017-04-07 23:50:55 +02:00