GitLab

f510aafb Merge branch 'upstream-KWSys' into update-kwsys
a930de85 KWSys 2019-02-14 (e270ce9f)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2967

8fc0c98f Tests: Fix Module.WriteCompilerDetectionHeader for Intel on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2963

fd86a4de FindLibXml2: Document LibXml2_FOUND as preferred case
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2970

5c26e3c5 VS: Fix validation of Windows 8.1 SDK
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dedmen Miller <dedmenmiller@googlemail.com>
Merge-request: !2962

cde2596a try_compile: Restore expansion of ;-list in COMPILE_DEFINITIONS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2965

Merge-request: !2965

Merge-request: !2970

Both `LIBXML2_FOUND` and `LibXml2_FOUND` are provided but the modern
convention is to use the case that matches the module name.

The quoting added by commit 8c5221fb (try_compile: Preserve special
characters in COMPILE_DEFINITIONS, 2019-01-21, v3.14.0-rc1~108^2~3)
broke the case that the `COMPILE_DEFINITIONS` value contains a `;`.
Without the quoting the `;` would be generated literally in an unquoted
argument in the test `CMakeLists.txt` file and would then be expanded.
With quoting the `;` is preserved, which is not the old behavior.

Fix this by expanding the `;`-list ahead of time.  Add test cases for
behavior with both `#` and `;`.

This was noticed with the PGI compiler where we set
`CMAKE_CXX*_STANDARD_COMPILE_OPTION` to values like `--c++17;-A`.  The
symptom had also been observed while preparing commit ef8f2376
(ParseImplicitIncludeInfo: add SunPro Fortran and PGI compiler, Cray
fix, 2019-01-29, v3.14.0-rc1~26^2~2) but was not recognized at the time
as a regression.  Revert the workaround added by that commit.

Fixes: #18919

Merge-request: !2962

a40864ae Autogen: Refactor RerunRccDepends test with fixed timestamp comparison
72435948 Autogen: Refactor RerunRccConfigChange test
6ed4ae4b Autogen: Refactor RerunMocBasic test with fixed timestamp comparison
fedbd16f Autogen: Refactor RerunMocPlugin test with fixed timestamp comparison
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2959

* upstream-KWSys:
  KWSys 2019-02-14 (e270ce9f)

Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit e270ce9fc60971006e934e9d53d11be5f85efc39 (master).

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

Albert Astals Cid (2):
      95ced423 hashtable: delete assignment operator instead of poisoning it
      6090d36b Glob: Use the default copy constructor and assignment operator

d80ecba5 Fortran: Fix submodule file names across compilers
72057d9c Fortran: Thread compiler id through to internal Fortran parser
7ae329e2 Fortran: Factor out .mod and .smod file name construction
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.co>
Merge-request: !2958

Merge-request: !2958

The naming convention for submodule files varies across compilers.  Add
a table to the compiler information modules and thread the information
through to the Fortran module dependency parser.  Fill out the table for
compiler ids known to support Fortran submodules.

Fixes: #18746

6fc33829 Update logic for sysroot in detected implicit include directories
2ad14ef4 cmAlgorithms: Add cmHasPrefix to match existing cmHasSuffix
557b2d6e Fix regression in -I/usr/include exclusion logic
017598a4 macOS: Fix addition of <sdk>/usr/include to default implicit include dirs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2957

76a5ac21 cmListFileLexer: Add missing include to avoid possible pointer truncation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2956

ec13bd52 Tests: Disable test that builds KWSys if not also building CMake
ded4bc13 Merge branch 'upstream-KWSys' into update-kwsys
f3999a21 KWSys 2019-02-12 (44676809)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2953

Fix a condition added by commit 091afa73 (Tests: Teach tests when to
treat clang-cl as MSVC, 2018-11-06) to be specific to Clang.

The check added by commit 0a29a311 (VS2017: Verify Windows 8.1 SDK
before using it, 2017-04-25, v3.8.1~2^2) used the wrong path to
`windows.h` within the SDK, leading to it never being detected.

Fixes: #18923

This refactors and simplifies the QtAutogen.RerunRccDepends test.
Repetitive task are packed into macros.
By using version strings to store file timestamps, timestamp comparison
becomes more reliable.  Test status and error messages are improved.

This refactors and simplifies the QtAutogen.RerunRccConfigChange test.
Repetitive task are packed into macros.
Test status and error messages are improved.

This refactors and simplifies the QtAutogen.RerunMocBasic test.
Repetitive task are packed into macros.
By using version strings to store file timestamps, timestamp comparison
becomes more reliable.  Test status and error messages are improved.

This refactors and simplifies the QtAutogen.RerunMocPlugin test.
Repetitive task are packed into macros.
By using version strings to store file timestamps, timestamp comparison
becomes more reliable.  Test status and error messages are improved.

Merge-request: !2956

The `cmsys/Enconding.h` include had a typo in its surrounding ifdef,
possibly causing a missing function declaration (`cmsysEncoding_DupToWide`).
As this is C code, this resulted in the code compiling, but with a truncated
return value, possibly causing crashes.

fc8b90af Create and use `cmGeneratorTarget::Names`
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2936

080a79ca cmSystemTools: More methods accept `std::string` params
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2952

c28abdb5 cmCursesMainForm: Fix lambda return type deducing warning
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2955

Merge-request: !2957

Since commit 5990ecb7 (Compute implicit include directories from
compiler output, 2018-12-07, v3.14.0-rc1~108^2) the values of the
`CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` variables are computed from
a real compiler invocation.  In this case the paths under the sysroot
should already have the sysroot prefix so we should no longer have to
add the sysroot prefix.  However, it is also possible for project code
to add its own paths to `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`
without the sysroot prefix and expect the historical addition of the
sysroot prefix to be preserved.

Try to account for both cases by conditionally adding the sysroot prefix
on implicit include directories that do not already have it.