Commit Graph

24710 Commits

Author SHA1 Message Date
Robert Maynard
f8a7cf85ad option: No CMP077 warnings when both cache and local variable exists
Previously we would warn when the local and cache version of a variable
exists, but this use case doesn't need a warning as it maintains backwards
compatibility.
2018-07-10 13:56:15 -04:00
Robert Maynard
2a5f5c0e31 option: respect existing normal variable
Add policy CMP0077 to change this behavior in a compatible way.
2018-07-09 07:48:28 -04:00
Robert Maynard
5bb3d40a28 cmOption: Remove VTK 4.0 workarounds
CMake has no reason to have special logic to fix bad logic
within VTK 4.0.
2018-06-21 11:18:16 -04:00
Craig Scott
6e7b424240 Merge topic 'subdir_target_sources'
316815e1f4 target_sources: Interpret relative paths as relative to the calling directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2128
2018-06-19 08:24:08 -04:00
Kitware Robot
fa744586cc CMake Nightly Date Stamp 2018-06-19 00:01:09 -04:00
Patrick Stotko
316815e1f4 target_sources: Interpret relative paths as relative to the calling directory
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
2018-06-18 21:01:57 +02:00
Brad King
b0b99d877e Merge topic 'find_program-conditional-cwd'
c76c1ea208 find_program: Consider CWD only for paths with separator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2120
2018-06-18 10:08:54 -04:00
Brad King
a75638c130 Merge topic 'update-kwsys'
4eae1c0816 Merge branch 'upstream-KWSys' into update-kwsys
f3cd44263e KWSys 2018-06-14 (2b0ca1d8)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2148
2018-06-18 10:07:38 -04:00
Kitware Robot
fe447879dd CMake Nightly Date Stamp 2018-06-18 00:01:12 -04:00
Kitware Robot
63fbff548e CMake Nightly Date Stamp 2018-06-17 00:01:09 -04:00
Kitware Robot
2eb4a16c21 CMake Nightly Date Stamp 2018-06-16 00:01:10 -04:00
Kitware Robot
d94997f0fe CMake Nightly Date Stamp 2018-06-15 00:01:06 -04:00
Sam Yates
c76c1ea208 find_program: Consider CWD only for paths with separator
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
2018-06-14 14:28:03 -04:00
Brad King
575f97763f Merge topic 'list_sort'
49a51a61d7 list: Add options to control the SORT comparison operation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2065
2018-06-14 13:55:57 -04:00
Brad King
4eae1c0816 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-06-14 (2b0ca1d8)
2018-06-14 11:26:37 -04:00
Kitware Robot
b367da75c1 CMake Nightly Date Stamp 2018-06-14 00:01:10 -04:00
Daniel Franke
49a51a61d7 list: Add options to control the SORT comparison operation 2018-06-13 14:06:29 -04:00
Brad King
aa155de860 Merge topic 'sphinx-info'
276e369813 Utilities/Sphinx: Add option to build and install Info manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2146
2018-06-13 10:50:14 -04:00
Brad King
38e4246f37 Merge topic 'restore-windows-resources-through-link'
4e6ff0ae24 Windows: Restore support for running CMake through a symlink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2147
2018-06-13 10:44:45 -04:00
Kitware Robot
cfac183295 CMake Nightly Date Stamp 2018-06-13 00:01:12 -04:00
Brad King
4e6ff0ae24 Windows: Restore support for running CMake through a symlink
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
2018-06-12 11:15:50 -04:00
Orivej Desh
276e369813 Utilities/Sphinx: Add option to build and install Info manual
Add option `SPHINX_INFO` to enable the Sphinx 'texinfo' builder and use
the `makeinfo` tool to convert it to a `.info` file.
2018-06-12 10:25:37 -04:00
Kitware Robot
f49870e372 CMake Nightly Date Stamp 2018-06-12 00:01:03 -04:00
Kitware Robot
018bcf6043 CMake Nightly Date Stamp 2018-06-11 00:01:07 -04:00
Kitware Robot
55c3435ce9 CMake Nightly Date Stamp 2018-06-10 00:01:05 -04:00
Kitware Robot
980914dc27 CMake Nightly Date Stamp 2018-06-09 00:01:24 -04:00
Brad King
812eaa465c Merge topic 'LINK_OPTIONS'
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
2018-06-08 09:37:48 -04:00
Brad King
7766e57ff0 Merge topic 'ninja-win-rsp'
88365838b8 Ninja: Use native slashes to pass rsp files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2136
2018-06-08 09:33:46 -04:00
Matthijs Kool
88365838b8 Ninja: Use native slashes to pass rsp files
Some tools on Windows (e.g. Embarcadero linkers) can't handle forward
slashes in paths to rsp files.
2018-06-08 09:31:23 -04:00
Brad King
733d3ac0e8 Merge topic 'install-code-script-genex'
6dad812143 install: Teach CODE,SCRIPT modes to evaluate generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2113
2018-06-08 09:28:43 -04:00
Kitware Robot
81fc1db0a6 CMake Nightly Date Stamp 2018-06-08 00:01:05 -04:00
Jon Chronopoulos
6dad812143 install: Teach CODE,SCRIPT modes to evaluate generator expressions
Fixes: #15785
2018-06-07 13:18:23 -04:00
Kitware Robot
f31d4ac7d6 CMake Nightly Date Stamp 2018-06-07 00:01:04 -04:00
Marc Chevrier
66ea1a3795 LINK_OPTIONS: Add support of "LINKER:" prefix 2018-06-06 17:22:41 +02:00
Marc Chevrier
c1f5a44b28 LINK_OPTIONS: Add new family of properties
This family enable to manage link flags

Three new properties:
* directory property: LINK_OPTIONS
* target properties: LINK_OPTIONS and INTERFACE_LINK_OPTIONS

Two new commands
* add_link_options(): to populate directory property
* target_link_options(): to populate target properties

Fixes: #16543
2018-06-06 17:22:39 +02:00
Marc Chevrier
8e28d2630a Makefile generator: link flags management refactoring 2018-06-06 17:02:33 +02:00
Kitware Robot
074bb25ca0 CMake Nightly Date Stamp 2018-06-06 00:01:08 -04:00
Brad King
acaaca968c Begin post-3.12 development 2018-06-05 11:50:27 -04:00
Brad King
af63c8bd61 CMake 3.12.0-rc1 version update 2018-06-05 11:43:10 -04:00
Brad King
8dbccd050c Merge topic 'more-misc-typos'
be28106880 Fix misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !2130
2018-06-05 11:26:12 -04:00
Kitware Robot
0fa6f8b2f5 CMake Nightly Date Stamp 2018-06-05 00:01:07 -04:00
luz.paz
be28106880 Fix misc. typos
Found via `codespell` and `grep`
2018-06-04 10:32:49 -04:00
Brad King
003c30fa18 Merge topic 'libarchive-ssize_t'
6d8ae1e6e4 cmSystemTools: Restore compilation with libarchive versions below 3.3.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2126
2018-06-04 09:49:13 -04:00
Brad King
5a9a3d28a4 Merge topic 'update-kwsys'
81870f1159 Merge branch 'upstream-KWSys' into update-kwsys
3af8c7715b KWSys 2018-06-01 (8ef62b28)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2125
2018-06-04 09:45:56 -04:00
Kitware Robot
f70da4ed83 CMake Nightly Date Stamp 2018-06-04 00:01:05 -04:00
Kitware Robot
72d5f23caf CMake Nightly Date Stamp 2018-06-03 00:01:05 -04:00
Kitware Robot
4b5d2249bf CMake Nightly Date Stamp 2018-06-02 00:01:07 -04:00
Brad King
6d8ae1e6e4 cmSystemTools: Restore compilation with libarchive versions below 3.3.1
In commit a203fcc63d (cmake: Teach '-E tar' to report errors copying
data, 2018-05-16) we introduced use of `la_ssize_t` but that was not
available until libarchive 3.3.1.  Switch to the `__LA_SSIZE_T` macro
we use elsewhere.
2018-06-01 13:27:08 -04:00
Brad King
81870f1159 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-06-01 (8ef62b28)
2018-06-01 12:54:13 -04:00
Kitware Robot
d7204e649e Revise C++ coding style using clang-format-6.0
Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`.  Use `clang-format` version 6.0.

* If you reached this commit for a line in `git blame`, re-run the blame
  operation starting at the parent of this commit to see older history
  for the content.

* See the parent commit for instructions to rebase a change across this
  style transition commit.
2018-06-01 09:53:42 -04:00