summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2019-02-171-1/+1
|
* CMake Nightly Date StampKitware Robot2019-02-161-1/+1
|
* Merge topic 'systools-cleanup'Brad King2019-02-155-24/+3
|\ | | | | | | | | | | | | bd20cc29a2 cmSystemTools: Remove redundant cmCopyFile() and Split() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2966
| * cmSystemTools: Remove redundant cmCopyFile() and Split()Vitaly Stakhovsky2019-02-155-24/+3
| |
* | Merge topic 'remove_return_void'Kyle Edwards2019-02-151-3/+3
|\ \ | | | | | | | | | | | | | | | | | | 30faf72625 Remove return from void function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2969
| * | Remove return from void functionAlbert Astals Cid2019-02-141-3/+3
| | |
* | | Merge topic 'ninja-swift-library-name'Brad King2019-02-153-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 157570b5a2 Add placeholder for Swift's library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2902
| * | | Add placeholder for Swift's library nameSaleem Abdulrasool2019-02-133-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to set the proper link name for the Swift library (soname). Because this needs to be passed to the object being compiled, we need to create a new placeholder so that it can be sent along to the frontend. Default to the target name unless it is explicitly provided.
* | | | Merge topic 'update-kwsys'Brad King2019-02-152-12/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | f510aafbfc Merge branch 'upstream-KWSys' into update-kwsys a930de85d8 KWSys 2019-02-14 (e270ce9f) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2967
| * | | 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-150-0/+0
|\ \ \ \
| * | | | CMake 3.14.0-rc2v3.14.0-rc2Brad King2019-02-151-1/+1
| | | | |
* | | | | Merge topic 'tests-intel-fixup'Brad King2019-02-151-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8fc0c98f08 Tests: Fix Module.WriteCompilerDetectionHeader for Intel on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2963
| * | | | | Tests: Fix Module.WriteCompilerDetectionHeader for Intel on WindowsBrad King2019-02-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a condition added by commit 091afa7342 (Tests: Teach tests when to treat clang-cl as MSVC, 2018-11-06) to be specific to Clang.
* | | | | | Merge branch 'release-3.14'Brad King2019-02-150-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'try_compile-expand-compile-defs' into release-3.14Brad King2019-02-155-13/+52
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2965
| * \ \ \ \ \ Merge branch 'FindLibXml2' into release-3.14Brad King2019-02-151-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2970
| * \ \ \ \ \ \ Merge branch 'vs2017-sdk81' into release-3.14Brad King2019-02-141-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2962
* | \ \ \ \ \ \ \ Merge topic 'FindLibXml2'Brad King2019-02-151-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd86a4de04 FindLibXml2: Document LibXml2_FOUND as preferred case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2970
| * | | | | | | | FindLibXml2: Document LibXml2_FOUND as preferred caseSaleem Abdulrasool2019-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both `LIBXML2_FOUND` and `LibXml2_FOUND` are provided but the modern convention is to use the case that matches the module name.
* | | | | | | | | Merge topic 'vs2017-sdk81'Brad King2019-02-151-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c26e3c5e3 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
| * | | | | | | | VS: Fix validation of Windows 8.1 SDKBrad King2019-02-141-1/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check added by commit 0a29a31161 (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
* | | | | | | | Merge topic 'try_compile-expand-compile-defs'Brad King2019-02-155-13/+52
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cde2596a19 try_compile: Restore expansion of ;-list in COMPILE_DEFINITIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2965
| * | | | | | | try_compile: Restore expansion of ;-list in COMPILE_DEFINITIONSBrad King2019-02-155-13/+52
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The quoting added by commit 8c5221fb1f (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 ef8f237686 (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
* | | | | | | CMake Nightly Date StampKitware Robot2019-02-151-1/+1
| | | | | | |
* | | | | | | Merge topic 'autogen_refactor_rerun_tests'Brad King2019-02-144-183/+274
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a40864ae53 Autogen: Refactor RerunRccDepends test with fixed timestamp comparison 724359489e Autogen: Refactor RerunRccConfigChange test 6ed4ae4bad Autogen: Refactor RerunMocBasic test with fixed timestamp comparison fedbd16f35 Autogen: Refactor RerunMocPlugin test with fixed timestamp comparison Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2959
| * | | | | | Autogen: Refactor RerunRccDepends test with fixed timestamp comparisonSebastian Holtermann2019-02-131-80/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Autogen: Refactor RerunRccConfigChange testSebastian Holtermann2019-02-131-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors and simplifies the QtAutogen.RerunRccConfigChange test. Repetitive task are packed into macros. Test status and error messages are improved.
| * | | | | | Autogen: Refactor RerunMocBasic test with fixed timestamp comparisonSebastian Holtermann2019-02-131-31/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Autogen: Refactor RerunMocPlugin test with fixed timestamp comparisonSebastian Holtermann2019-02-131-58/+93
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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
generated by cgit v0.12 at 2025-01-10 06:34:43 (GMT)