summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* option: respect existing normal variableRobert Maynard2018-07-0915-28/+115
| | | | Add policy CMP0077 to change this behavior in a compatible way.
* Option: Add a test that verifies interaction with normal variablesRobert Maynard2018-06-212-0/+17
|
* cmOption: Remove VTK 4.0 workaroundsRobert Maynard2018-06-211-13/+1
| | | | | CMake has no reason to have special logic to fix bad logic within VTK 4.0.
* Merge topic 'subdir_target_sources'Craig Scott2018-06-1946-4/+447
|\ | | | | | | | | | | | | 316815e1f4 target_sources: Interpret relative paths as relative to the calling directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2128
| * target_sources: Interpret relative paths as relative to the calling directoryPatrick Stotko2018-06-1846-4/+447
| | | | | | | | | | | | | | | | | | | | Previously the command considered non-absolute source file paths relative to the associated target on the LHS. This causes problems in incremental builds where files are added from subdirectories and forces users to workaround by manually converting to absolute paths. Change this to enable more intuitive usage by projects. Fixes #17981
* | CMake Nightly Date StampKitware Robot2018-06-191-1/+1
| |
* | Merge topic 'find_program-conditional-cwd'Brad King2018-06-185-8/+97
|\ \ | | | | | | | | | | | | | | | | | | c76c1ea208 find_program: Consider CWD only for paths with separator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2120
| * | find_program: Consider CWD only for paths with separatorSam Yates2018-06-145-8/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_program() incorrectly prepended search path components to absolute file paths, and incorrectly searched the current working directory for files that contained no directory separators. * Replace calls cmFindProgramHelper::CheckDirectory(std::string()) with call of new method cmFindProgramHelper::CheckCompoundNames() that checks for the presence of a directory separator in the file name. * Use cmSystemTools::CollapseCombinedPath rather than string concatenation to properly combine absolute file names with search path components. * Add unit tests to verify corrections. Fixes: #18044
* | | Merge topic 'update-kwsys'Brad King2018-06-184-27/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4eae1c0816 Merge branch 'upstream-KWSys' into update-kwsys f3cd44263e KWSys 2018-06-14 (2b0ca1d8) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2148
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-06-144-27/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-06-14 (2b0ca1d8)
| | * | | KWSys 2018-06-14 (2b0ca1d8)KWSys Upstream2018-06-144-27/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 2b0ca1d85d6e3fcf3b3fa375783c33524629f256 (master). Upstream Shortlog ----------------- Marian Klymov (3): 0b9f51a1 Remove redundant calls to c_str 361e54e3 Get rid of redundant string initialization 61501133 SystemInformation: Avoid use of dangling pointers on Solaris
* | | | | Merge topic 'UseSWIG-bugfixes'Brad King2018-06-185-0/+92
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08f2a2408d UseSWIG: add support of target property INCLUDE_DIRECTORIES consumption Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2141
| * | | | | UseSWIG: add support of target property INCLUDE_DIRECTORIES consumptionMarc Chevrier2018-06-135-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18003
* | | | | | CMake Nightly Date StampKitware Robot2018-06-181-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-06-171-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-06-161-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-06-151-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'list_sort'Brad King2018-06-1430-11/+391
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 49a51a61d7 list: Add options to control the SORT comparison operation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2065
| * | | | list: Add options to control the SORT comparison operationDaniel Franke2018-06-1330-11/+391
| | |_|/ | |/| |
* | | | Merge branch 'release-3.11'Brad King2018-06-140-0/+0
|\ \ \ \
| * | | | CMake 3.11.4v3.11.4Brad King2018-06-141-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-06-141-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release-3.12'Brad King2018-06-130-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'sphinx-info' into release-3.12v3.12.0-rc1Brad King2018-06-133-2/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2146
| * \ \ \ \ Merge branch 'restore-windows-resources-through-link' into release-3.12Brad King2018-06-131-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2147
| * \ \ \ \ \ Merge branch 'UseSWIG-csharp-variant' into release-3.12Brad King2018-06-136-2/+103
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2137
| * \ \ \ \ \ \ Merge branch 'UseSWIG-fix-genex' into release-3.12Brad King2018-06-121-7/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2143
| * \ \ \ \ \ \ \ Merge branch 'UseSWIG-handle-SWIG_MODULE_NAME' into release-3.12Brad King2018-06-121-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2145
* | \ \ \ \ \ \ \ \ Merge topic 'sphinx-info'Brad King2018-06-133-2/+42
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 276e369813 Utilities/Sphinx: Add option to build and install Info manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2146
| * | | | | | | | | Utilities/Sphinx: Add option to build and install Info manualOrivej Desh2018-06-123-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option `SPHINX_INFO` to enable the Sphinx 'texinfo' builder and use the `makeinfo` tool to convert it to a `.info` file.
* | | | | | | | | | Merge topic 'UseSWIG-csharp-variant'Brad King2018-06-136-2/+103
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c2fb4c896 UseSWIG: Add CSHARP variant for wrapper files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2137
| * | | | | | | | | UseSWIG: Add CSHARP variant for wrapper filesRishi Theivendran2018-06-126-2/+103
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #18065 Fixes: #18066
* | | | | | | | | Merge topic 'UseSWIG-fix-genex'Brad King2018-06-131-7/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88dd5dc9ff UseSWIG: add support for generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2143
| * | | | | | | | UseSWIG: add support for generator expressionsMarc Chevrier2018-06-121-7/+7
| | | | | | | | |
* | | | | | | | | Merge topic 'UseSWIG-handle-SWIG_MODULE_NAME'Brad King2018-06-131-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 156138d5f1 UseSWIG: Fix handling of `SWIG_MODULE_NAME` source file property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2145
| * | | | | | | | UseSWIG: Fix handling of `SWIG_MODULE_NAME` source file propertyFelix Schwitzer2018-06-121-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo from commit 0bef9eb410 (UseSWIG: modernize module, 2018-01-29) that caused `UseSWIG` to ignore an eventually set property `SWIG_MODLUE_NAME`. Building multiple python modules using the mentioned property as described in the docs could lead to an invalid, or even worse, inconsistent `build.ninja` file. The reason is that the generated list of support files was not unique. For each module the support file was always named the same, namely `path/to/builddir/MODULENAME.py`.
* | | | | | | | Merge branch 'release-3.11'Brad King2018-06-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'restore-windows-resources-through-link' into release-3.11Brad King2018-06-121-1/+2
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | Merge-request: !2147
* | | | | | | | Merge topic 'restore-windows-resources-through-link'Brad King2018-06-131-1/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e6ff0ae24 Windows: Restore support for running CMake through a symlink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2147
| * | | | | | | Windows: Restore support for running CMake through a symlinkBrad King2018-06-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.11.3~3^2 (cmSystemTools: Revert GetRealPath implementation on Windows, 2018-05-29) broke the feature added by commit v3.11.0-rc1~64^2 (Windows: Add support for running CMake tools through a symlink, 2018-01-21). Use `GetRealPathResolvingWindowsSubst` in the latter code path to restore it. Fixes: #17882
* | | | | | | | CMake Nightly Date StampKitware Robot2018-06-131-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.12'Brad King2018-06-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'FindPython-3.8' into release-3.12Brad King2018-06-083-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2140
* | \ \ \ \ \ \ \ Merge topic 'FindPython-3.8'Brad King2018-06-123-3/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6e7f2c37f FindPython: Add support for version 3.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2140
| * | | | | | | | FindPython: Add support for version 3.8Marcel Plch2018-06-083-3/+3
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Python 3.7 is about to be released, making the development version 3.8.
* | | | | | | | CMake Nightly Date StampKitware Robot2018-06-121-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-06-111-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-06-101-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-06-091-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'LINK_OPTIONS'Brad King2018-06-08130-77/+1321
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66ea1a3795 LINK_OPTIONS: Add support of "LINKER:" prefix c1f5a44b28 LINK_OPTIONS: Add new family of properties 8e28d2630a Makefile generator: link flags management refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !2033