summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-02-142-12/+4
|\ | | | | | | | | * upstream-KWSys: KWSys 2019-02-14 (e270ce9f)
| * KWSys 2019-02-14 (e270ce9f)KWSys Upstream2019-02-142-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'release-3.14'Brad King2019-02-140-0/+0
|\ \
| * \ Merge branch 'fortran-submodule-names' into release-3.14Brad King2019-02-1412-11/+91
| |\ \ | | | | | | | | | | | | Merge-request: !2958
| * \ \ Merge branch 'fix-pointer-truncation' into release-3.14Brad King2019-02-132-2/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2956
| * \ \ \ Merge branch 'fix-legacy-implicit-includes' into release-3.14Brad King2019-02-134-13/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2957
* | \ \ \ \ Merge topic 'fortran-submodule-names'Brad King2019-02-1412-11/+91
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d80ecba5c2 Fortran: Fix submodule file names across compilers 72057d9c15 Fortran: Thread compiler id through to internal Fortran parser 7ae329e2ed 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
| * | | | | Fortran: Fix submodule file names across compilersBrad King2019-02-1412-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Fortran: Thread compiler id through to internal Fortran parserBrad King2019-02-145-5/+26
| | | | | |
| * | | | | Fortran: Factor out .mod and .smod file name constructionBrad King2019-02-142-6/+21
| | | | | |
* | | | | | Merge topic 'fix-legacy-implicit-includes'Brad King2019-02-144-13/+30
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fc3382944 Update logic for sysroot in detected implicit include directories 2ad14ef4ea cmAlgorithms: Add cmHasPrefix to match existing cmHasSuffix 557b2d6e65 Fix regression in -I/usr/include exclusion logic 017598a444 macOS: Fix addition of <sdk>/usr/include to default implicit include dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2957
| * | | | | Update logic for sysroot in detected implicit include directoriesBrad King2019-02-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 5990ecb741 (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.
| * | | | | cmAlgorithms: Add cmHasPrefix to match existing cmHasSuffixBrad King2019-02-131-0/+8
| | | | | |
| * | | | | Fix regression in -I/usr/include exclusion logicBrad King2019-02-132-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 15ad830062 (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
| * | | | | macOS: Fix addition of <sdk>/usr/include to default implicit include dirsBrad King2019-02-131-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 1293ed8507 (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.
* | | | | Merge topic 'fix-pointer-truncation'Brad King2019-02-142-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 76a5ac2100 cmListFileLexer: Add missing include to avoid possible pointer truncation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2956
| * | | | cmListFileLexer: Add missing include to avoid possible pointer truncationZsolt Parragi2019-02-132-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'update-kwsys'Brad King2019-02-148-28/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec13bd5230 Tests: Disable test that builds KWSys if not also building CMake ded4bc136e Merge branch 'upstream-KWSys' into update-kwsys f3999a21c8 KWSys 2019-02-12 (44676809) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2953
| * | | | Tests: Disable test that builds KWSys if not also building CMakeBrad King2019-02-131-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-02-127-17/+29
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * upstream-KWSys: KWSys 2019-02-12 (44676809)
| | * | | KWSys 2019-02-12 (44676809)KWSys Upstream2019-02-127-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | CMake Nightly Date StampKitware Robot2019-02-141-1/+1
| | | | |
* | | | | Merge topic 'names'Brad King2019-02-1311-270/+187
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fc8b90af2c Create and use `cmGeneratorTarget::Names` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2936
| * | | | | Create and use `cmGeneratorTarget::Names`Saleem Abdulrasool2019-02-1111-270/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 topic 'systools-stdstring2'Brad King2019-02-137-74/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 080a79ca4a cmSystemTools: More methods accept `std::string` params Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2952
| * | | | | | cmSystemTools: More methods accept `std::string` paramsVitaly Stakhovsky2019-02-117-74/+78
| |/ / / / /
* | | | | | Merge topic 'cmcurses-fix-solaris-lambda-warning'Brad King2019-02-131-5/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c28abdb5ac cmCursesMainForm: Fix lambda return type deducing warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2955
| * | | | | | cmCursesMainForm: Fix lambda return type deducing warningArtur Ryt2019-02-121-5/+6
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | It was issued by sparc compiler on Solaris system See !2947
* | | | | | Merge branch 'release-3.14'Brad King2019-02-130-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'genex-GENEX_EVAL-fix-recursion' into release-3.14Brad King2019-02-134-14/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2954
* | \ \ \ \ \ Merge topic 'genex-GENEX_EVAL-fix-recursion'Brad King2019-02-134-14/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e429e9af42 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
| * | | | | | genex: Fix erroneous handling of recursion for $<GENEX_EVAL:>Marc Chevrier2019-02-134-14/+9
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Fixes: #18894
* | | | | | CMake Nightly Date StampKitware Robot2019-02-131-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'clangcl-fixes'Brad King2019-02-1210-11/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 091afa7342 Tests: Teach tests when to treat clang-cl as MSVC 006768903c Work around clang-cl breakage on make_unique/std::forward d625dfcdf9 Avoid compiling CMake itself as C++17 with Clang's MSVC ABI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2573
| * | | | | Tests: Teach tests when to treat clang-cl as MSVCZsolt Parragi2019-02-117-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Disable the system include unused variable test in ExportImport when clang is in MSVC compatible mode. * Disable CxxDialect testcase when clang is in MSVC compatible mode, as it doesn't support `typeof`. * Teach Module.WriteCompilerDetectionHeader to treat clang-cl as MSVC. * Disable the SystemIncludeDirectories testcase within IncludeDirectories when clang is in MSVC compatible mode. * Disable the CMakeOnly.CheckCXXCompilerFlag testcase when clang is in MSVC compatible mode. * Treat clang-cl as MSVC in LinkOptions.cmake in the try_run and try_compile testcases.
| * | | | | Work around clang-cl breakage on make_unique/std::forwardZsolt Parragi2019-02-112-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang on Windows with the MSVC ABI produces link errors of the form `unresolved std::_Iosb<int>::{app,_Openmode} in ...`. Use a temporary variable to forward as lvalue rather than rvalue to work around the problem.
| * | | | | Avoid compiling CMake itself as C++17 with Clang's MSVC ABIZsolt Parragi2019-02-111-0/+13
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | GUID functions in ATL cause compilation errors with this compiler. Add the offending case to our check for C++17 support so that it is not used by default when it does not work.
* | | | | Merge topic 'progress-stdstring'Brad King2019-02-1222-50/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 950c099d83 cmake: Progress functions use `std::string` param Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2948
| * | | | | cmake: Progress functions use `std::string` paramVitaly Stakhovsky2019-02-1122-50/+58
| |/ / / /
* | | | | Merge topic 'modernize-cmCursesMainForm'Brad King2019-02-121-62/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6291eee25 cmCursesMainForm: Modernize with STL and ranged-for loops Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2947
| * | | | | cmCursesMainForm: Modernize with STL and ranged-for loopsArtur Ryt2019-02-101-62/+48
| | | | | |
* | | | | | Merge topic 'cmCTestRunTest-compress'Brad King2019-02-122-78/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 948c55857e cmCTestRunTest: Remove duplicated compression logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2946
| * | | | | | cmCTestRunTest: Remove duplicated compression logicRegina Pfeifer2019-02-102-78/+11
| |/ / / / /
* | | | | | Merge branch 'release-3.14'Brad King2019-02-120-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'doc-if-legacy' into release-3.14Brad King2019-02-111-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2950
| * \ \ \ \ \ Merge branch 'FindMatlab-version-empty' into release-3.14Brad King2019-02-111-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2949
| * \ \ \ \ \ \ Merge branch 'FindOctave-interp-target' into release-3.14Brad King2019-02-113-1/+43
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2931
* | \ \ \ \ \ \ \ Merge topic 'FindMatlab-version-empty'Brad King2019-02-121-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40176749bc FindMatlab: Tolerate empty version log file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2949
| * | | | | | | | FindMatlab: Tolerate empty version log fileSebastian Nagel2019-02-111-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge topic 'doc-if-legacy'Brad King2019-02-121-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 572b4fd85b Help: Fix elseif/endif typo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2950
generated by cgit v0.12 at 2025-01-01 15:17:47 (GMT)