GitLab

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

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

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

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.

The change in commit 15ad8300 (Refactor exclusion of -I/usr/include to
avoid per-language values, 2019-01-21, v3.14.0-rc1~108^2~4) caused the
exclusion to apply to Fortran, but it was only meant for C, CXX, and
CUDA.  The purpose of the change was to prepare for the value of
`CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` to be computed from the
actual compiler instead of hard-coded.  We need to preserve exclusion of
`-I/usr/include` if the compiler has any implicit include directory that
looks intended to replace it, e.g. `<sdk>/usr/include` on macOS.

Fixes: #18914

In commit 1293ed85 (ParseImplicitIncludeInfo: keep implicit incl.
consistent when rerunning cmake, 2019-01-30, v3.14.0-rc1~26^2) the
`Platform/UnixPaths` module was updated to add `/usr/include` to
`CMAKE_{C,CXX,CUDA}_IMPLICIT_INCLUDE_DIRECTORIES` through an
initialization variable used by `CMakeDetermineCompilerABI` instead of
directly.  This approach makes it only a default that can be overridden
by detection of the implicit include directories really used by the
compiler.

The addition of `<sdk>/usr/include` to default implicit include
directories by the `Platform/Darwin` module needs the same update but
was accidentally left out of the original commit.

e429e9af genex: Fix erroneous handling of recursion for $<GENEX_EVAL:>
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: yrHeTaTeJlb <jjj.bo@yandex.ru>
Merge-request: !2954

Merge-request: !2954

Fixes: #18894

If `CMake_TEST_EXTERNAL_CMAKE` is enabled then the compiler with which
we are driving tests may not be able to compile CMake, so do not try
to compile KWSys with it either.

It was issued by sparc compiler on Solaris system
See !2947

* upstream-KWSys:
  KWSys 2019-02-12 (44676809)

Code extracted from:

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

at commit 4467680959f82b755462a8530ef5d0dbd928d2d4 (master).

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

Albert Astals Cid (1):
      7d50c26d Delete some default constructors and assignment operators

Artur Ryt (1):
      01089e4c Prefer back/data over dereferencing rbegin/begin iterator

091afa73 Tests: Teach tests when to treat clang-cl as MSVC
00676890 Work around clang-cl breakage on make_unique/std::forward
d625dfcd Avoid compiling CMake itself as C++17 with Clang's MSVC ABI
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2573

950c099d cmake: Progress functions use `std::string` param
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2948

f6291eee cmCursesMainForm: Modernize with STL and ranged-for loops
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2947

948c5585 cmCTestRunTest: Remove duplicated compression logic
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2946

40176749 FindMatlab: Tolerate empty version log file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2949

572b4fd8 Help: Fix elseif/endif typo
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2950

6725975b FindOctave: Add target for octinterp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2931

Merge-request: !2950

In CMake 3.13.x, we had this evaluation for if() conditions:

    if(a) elseif(b) else(a) endif(a)

The sensible intention of the change in commit c2efb3ef (Help: Revise
docs on Scripting Commands, 2018-10-16, v3.14.0-rc1~505^2) was:

> "endif", "endfunction" etc: Explain that the argument is optional and
> maintained for compatibility only

Instead of "endif", it ended up being written to the documentation as
"elseif" by the commit author (oops) to if()'s page.

    if(a) elseif(a!?) else() endif(a?)

Truthfully, endif()'s parameter should be an optional verbatim repeat
and not elseif()'s. If it wasn't, elseif() would be described to be the
same as if(). The rightful intended description is:

    if(a) elseif(b) else() endif()

Fix that typo.

Rather than taking a number of out parameters for the various names,
create a structure that is reused for both `GetLibraryNames` and
`GetExecutableNames`.  Replace uses according to the new interface.

Merge-request: !2949