* upstream-KWSys:
  KWSys 2016-03-08 (6b60c184)

Kitware Robot authored 9 years ago and Brad King committed 9 years ago

Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 6b60c1843dbba9d4929496f9292cc78dab945c68 (master).

Upstream Shortlog
-----------------

Mariusz Pluciński (1):
      6b60c184 SystemInformation: Fix compilation on VS Clang/C2 toolset

Sean McBride (3):
      6ea22e65 Suppressed clang -Wcomma warnings with void cast
      8d9d489d Fixed clang-tidy warnings about macros missing defensive parens
      1c544330 Made private method static to silence warning

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

3906ca5a BundleUtilities: Fix regression handling frameworks

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

d4482dd9 CPackWIX: Support binary-only WiX installations

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

b682debd Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

6122909c VS: Add option to set `ConfigurationType` of a .vcxproj file

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

190a5fdf Automatically use OpenSSL by default on Linux and FreeBSD if available

Clinton Stimpson authored 9 years ago and Brad King committed 9 years ago

Fix logic error introduced in commit e422f738 (BundleUtilities: Fix
treatment of .dylib inside .framework folders, 2016-02-11).

Marc Chevrier authored 9 years ago and Nils Gladitz committed 9 years ago

Also fix URLUPDATEINFO -> ARPURLUPDATEINFO reference
in CPACK_WIX_PROPERTY_<PROPERTY> examples.

Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>

Since https is almost ubiquitous nowadays we should support it by
default whenever possible.  When building our own curl, we already
automatically enable SSL/TLS support on Windows and OS X by using the
OS-native APIs.  On UNIX platforms we need to use OpenSSL but have not
done so by default before, leading to possible user confusion when https
transfers fail later.  Fix this by searching for OpenSSL quietly and
enabling use of it automatically if it is found.

Do this only on Linux and FreeBSD for now because on other UNIX
platforms (e.g. AIX, HP-UX, SunOS) it seems too easy to find an
OpenSSL that is not compatible with the target compiler.

Fabian Otto authored 9 years ago and Brad King committed 9 years ago

Add a VS_CONFIGURATION_TYPE target property to set this value
explicitly.  This is useful to build a Windows Kernel Mode Driver,
for example.

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

f3ac0651 Improve compiler check message on non-Make generators

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

bc29ed54 CTest: Make coverage file selection more specific.

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

7f1bd9fe try_compile: Add option to control type of target

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

6c9586f9 file(DOWNLOAD): Fill STATUS variable on hash mismatch (#15987)

When performing some other testing, the globs for Blanket.js and Delphi
code coverage are picking up unintended files.  Change the query for the
Delphi coverage to follow the naming convention, and check the second line
of the found JSON files for certain text before parsing them as coverage files.

Although we fail with an error on a hash mismatch, it is not a fatal
error so the script may continue processing.  If the download itself had
no error then report in the STATUS variable that the operation was not
successful due to the hash mismatch.

Suggested-by: Tobias Hieta <tobias@hieta.se>

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

dc422d27 VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

aff38945 Eclipse: only add C/CXX macros if the language is enabled
6ee6b17e Eclipse: add newer version numbers

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

43025124 cmake_parse_arguments: Additional regression tests

When we check for a working compiler we print a message of the form:

    Check for working <LANG> compiler: ...

At one time CMAKE_<LANG>_COMPILER was not well-defined for all
generators so we printed the generator name instead of the path to
the compiler.  Nowadays we always know the compiler, so update the
message to print it unconditionally.  This is more informative than
the generator name, especially when a toolset (cmake -T) is used.

Suggested-by: Gregor Jasny <gjasny@googlemail.com>

With this patch, the builtin macros and include dirs are only
added to the project file if the C/CXX langauges are really enabled.
I.e. before this patch the CXX-stuff was in the project file as soon
as CXX had been enabled at least once for this build tree.
I.e. disabling CXX later on did not remove the CXX macros etc.
from the project file (related to #15150)

Alex

Alex

Since commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for
GenerateDebugInformation, 2016-01-08) we generate invalid project
files for the v110 and v120 toolsets.  VS complains:

    C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets(639,9):
    error MSB4030: "Debug" is an invalid value for the "GenerateDebugInformation" parameter of
    the "Link" task. The "GenerateDebugInformation" parameter is of type "System.Boolean".

This reveals that our VS flag map selection should be based on the
toolset instead of the version of VS.  However, that will be a
non-trivial change so for now fix this particular use case by
hard-coding a correction to the flag map.

Reported-by: Gregor Jasny <gjasny@googlemail.com>

Brad King authored 9 years ago and Kitware Robot committed 9 years ago

33507e2a Help: Fix typos in cmake-packages.7 manual

Dimitar authored 9 years ago and Brad King committed 9 years ago

Add regression tests for the arguments handling in
cmake_parse_arguments. The tests were run also against cmake 3.4.1
maint branch to verify that there are no regressions.

Signed-off-by: Dimitar Yordanov <dimitar.yordanov@sap.com>
Signed-off-by: Matthias Maennich <matthias.maennich@sap.com>