We already add the crypto library after the ssl library when using
OpenSSL.  Do not add it to the list of libraries individually or we may
end up with the wrong order later.  Further investigation will be needed
to see how this change can be reconciled with the upstream need for the
original line.

LibArchive now defines this explicitly if it is not defined already.
Since we define _WIN32_WINNT explicitly, we must now define a consistent
value of NTDDI_VERSION explicitly too.

Resolve conflicts in C code by taking their side.  Resolve conflicts in
CMake code by integrating the changes.

We will now manage the libarchive source tree updates using
the `Utilities/Scripts/update-libarchive.bash` script.  Drop
the README that covered the old method.

LibArchive Upstream authored 8 years ago and Brad King committed 8 years ago

Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 167e97be1d35c1e0947d768adbf94712244aad6b (master).

LibArchive Upstream authored 9 years ago and Brad King committed 8 years ago

Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 3bfe5f1f8cc7afb63bfb93561a390050ca111c39 (3bfe5f1).

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

47c29885 Tests: Fix RunCMake.BuildDepends filesystem delay for Watcom WMake
26790ad9 Tests: Add workaround to Wrapping test for Watcom failure

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

e1c77472 Format include directive blocks and ordering with clang-format
180538c7 Source: Stabilize include order
0e7bca92 Utilities/Release: Stabilize include order in WiX custom action
eb817be0 Tests: Stabilize include order in MFC, VSXaml, and VSWinStorePhone
eda313b4 Tests: Stabilize include order in StringFileTest
7110b754 CursesDialog: add missing cmState include
d7a5f255 Modules: Remove unused CMakeTestWatcomVersion.c file

Sort include directives within each block (separated by a blank line) in
lexicographic order (except to prioritize `sys/types.h` first).  First
run `clang-format` with the config file:

    ---
    SortIncludes: false
    ...

Commit the result temporarily.  Then run `clang-format` again with:

    ---
    SortIncludes: true
    IncludeCategories:
      - Regex:    'sys/types.h'
        Priority: -1
    ...

Commit the result temporarily.  Start a new branch and cherry-pick the
second commit.  Manually resolve conflicts to preserve indentation of
re-ordered includes.  This cleans up the include ordering without
changing any other style.

Use the following command to run `clang-format`:

    $ git ls-files -z -- \
        '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' |
      egrep -z -v '(Lexer|Parser|ParserHelper)\.' |
      egrep -z -v '^Source/cm_sha2' |
      egrep -z -v '^Source/(kwsys|CursesDialog/form)/' |
      egrep -z -v '^Utilities/(KW|cm).*/' |
      egrep -z -v '^Tests/Module/GenerateExportHeader' |
      egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' |
      xargs -0 clang-format -i

This selects source files that do not come from a third-party.

Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>

Each source file has a logical first include file.  Include it in an
isolated block so that tools that sort includes do not move them.

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

d2a06159 Features: Record features for VS 2015 Update 2

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

ce82e0a5 Deprecate Visual Studio 7 .NET 2003 generator
6a501b65 Tests: Drop test for VS 7.0 generator deprecation warnings

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

304ab71d Clang-Tidy: Give entire compiler command line to clant-tidy tool

Our 1.125s delay does not seem to be long enough to be reliable with
the Watcom `wmake` tool.  Use a longer delay for Watcom.

In `detect_nsis_overwrite.cpp` we include windows.h first, and we must
preserve that.  Place the include in an isolated block so that tools
that sort includes do not move it.

These tests use a precompiled header that must be included first.
Include the header in an isolated block so that tools that sort
includes do not move it.

Daniel Pfeifer authored 8 years ago and Brad King committed 8 years ago

This test generates a header file which is not self-contained.
Include it in a separate block of includes so that tools that
sort includes do not move it.

This file has not been used since commit v2.8.10~218^2~7^2 (Watcom:
Simplify compiler version detection, 2012-08-13).

The Watcom tools do not seem to like our wrapFLTK executable
to mix C and C++ sources.  Work around this by using C++ for
both sources.

Update documentation to mark the generator deprecated.  Add a warning at
the end of generation plus an option to turn off the warning.

We removed this generator but forgot to remove this now-unused test
case.

Daniel Pfeifer authored 8 years ago and Brad King committed 8 years ago

The tool expects the entire compiler command, including `cc`.  It
will automatically skip that and extract the options it needs.

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

21b1fa5c Help: Add notes for topic 'intel-compiler-features'
9addce99 Features: Record standard flags for Intel C/C++ on Windows
15a6c950 WCDH: Add Intel to list of supported compilers
36f32ede Features: Record standards and features for Intel C on UNIX
d028b948 Features: Specify minimum version Intel C++ 12.1
be910f00 Features: Record standards and features for Intel C++ on UNIX
7f401ae4 Features: Detect C default dialect on MSVC-like compilers

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

7db9f3f2 ExternalProject: Add option to perform a shallow Git clone (#15291)

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

2d7d33ec Help: Hyperlink properties

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

04d74a7f Clang-Tidy: copy stdout to sterr; ignore original stderr

Select the `-std=` or `-Qstd=` flag based on whether Intel is GNU-like
or MSVC-like, respectively.

Robert Maynard authored 8 years ago and Brad King committed 8 years ago

Record features for Intel C 12.1 and above.  Skip this for now on
Windows (where Intel C simulates MSVC).

Robert Maynard authored 8 years ago and Brad King committed 8 years ago

Versions below 12.1 do not provide enough information to properly detect
if compiling with c++98 or c++0x enabled so remove them from the
supported list.

Levi Morrison authored 9 years ago and Brad King committed 8 years ago

Skip this for now on Windows (where Intel C++ simulates MSVC).