summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'file_symlink_docs'Brad King2019-02-181-23/+23
|\ | | | | | | | | | | | | 0f5a9f7934 Help: Clarify and improve readability of link-related file subcommands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2974
| * Help: Clarify and improve readability of link-related file subcommandsCraig Scott2019-02-161-23/+23
| |
* | Merge topic 'require-xcode-5'Brad King2019-02-188-165/+19
|\ \ | | | | | | | | | | | | | | | | | | afb325018e Xcode: Require at least Xcode 5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2975
| * | Xcode: Require at least Xcode 5Gregor Jasny2019-02-168-165/+19
| | |
* | | Merge branch 'release-3.14'Brad King2019-02-180-0/+0
|\ \ \
| * \ \ Merge branch 'externalproject_docs' into release-3.14Brad King2019-02-182-2/+3
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2978
| * \ \ \ Merge branch 'get_filename_component_docs' into release-3.14Brad King2019-02-181-4/+3
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | Merge-request: !2973
* | | | | Merge topic 'get_filename_component_docs'Brad King2019-02-181-4/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 2cc145928c Help: Remove outdated statement about get_filename_component() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2973
| * | | | Help: Remove outdated statement about get_filename_component()Craig Scott2019-02-161-4/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | After !2853, the statement that the "longest file extension is always considered" is no longer true. Both NAME_WLE and LAST_EXT now return details based on the shortest file extension. Fixes: 7a25ef326b (Help: Add documentation for new get_filename_component components, 2019-01-24, 3.14.0-rc1)
* | | | Merge topic 'externalproject_docs'Brad King2019-02-182-2/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | f2072a6554 Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behavior f2820bce15 Release notes: Make ExternalProject dot points consistent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2978
| * | | Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behaviorCraig Scott2019-02-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The output is only merged for a step if it is logging to file. This option is ignored for steps that are logging normally. A minor grammatical error has also been fixed as part of this change.
| * | | Release notes: Make ExternalProject dot points consistentCraig Scott2019-02-171-1/+1
| |/ / | | | | | | Use same phrasing and command linking.
* | | Merge topic 'delete_copy_assign'Brad King2019-02-1835-1/+126
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ae5e97a005 Delete some default constructors and assignment operators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2968
| * | | Delete some default constructors and assignment operatorsAlbert Astals Cid2019-02-1535-1/+126
| | | | | | | | | | | | | | | | | | | | | | | | They are unused, but if someone used them they would lead to problems since they would copy the internal raw pointers and the destructor would cause double delete
* | | | Merge topic 'autogen_test_fix'Brad King2019-02-181-11/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91344e7a46 Autogen: Fix RerunMocPlugin test for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2971
| * | | | Autogen: Fix RerunMocPlugin test for Ninja generatorSebastian Holtermann2019-02-151-11/+4
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-02-181-1/+1
| | | | |
* | | | | 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
generated by cgit v0.12 at 2025-02-02 15:31:25 (GMT)