mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
39,963 Commits 2 Branches 401 Tags
eb63a07eaa70ab56ccf46500b9a077d6cbbd289a
Commit Graph

39963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad King 5262215c67 Merge topic 'UseSWIG-bugfixes' 
08f2a2408d UseSWIG: add support of target property INCLUDE_DIRECTORIES consumption

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2141
 2018-06-18 10:06:29 -04:00
Kitware Robot fe447879dd CMake Nightly Date Stamp 2018-06-18 00:01:12 -04:00
Jon Chronopoulos 797de7a6f6 VS10Project: Expand VS_DEBUGGER_* capabilities 
This adds VS_DEBUGGER_COMMAND_ARGUMENTS and VS_DEBUGGER_ENVIRONMENT as
well as allowing VS_DEBUGGER_* to use generator expressions.
 2018-06-17 17:55:27 +10: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
KWSys Upstream f3cd44263e KWSys 2018-06-14 (2b0ca1d8) 
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
 2018-06-14 11:26:36 -04:00
Brad King 65ee7d1cc3 Merge branch 'release-3.11' 2018-06-14 10:34:23 -04:00
Brad King 316bd45439 CMake 3.11.4 v3.11.4 2018-06-14 09:13:47 -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
Marc Chevrier 08f2a2408d UseSWIG: add support of target property INCLUDE_DIRECTORIES consumption 
Fixes: #18003
 2018-06-13 17:46:16 +02:00
Brad King 9eeed4f4d8 Merge branch 'release-3.12' 2018-06-13 10:52:58 -04:00
Brad King ef5e2e8a62 Merge branch 'sphinx-info' into release-3.12 
Merge-request: !2146
v3.12.0-rc1 		2018-06-13 10:52:11 -04:00
Brad King 985c78c7e1 Merge branch 'restore-windows-resources-through-link' into release-3.12 
Merge-request: !2147
 2018-06-13 10:52:01 -04:00
Brad King 93fe9fc1a2 Merge branch 'UseSWIG-csharp-variant' into release-3.12 
Merge-request: !2137
 2018-06-13 10:51:49 -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 0247f6836c Merge topic 'UseSWIG-csharp-variant' 
0c2fb4c896 UseSWIG: Add CSHARP variant for wrapper files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2137
 2018-06-13 10:48:51 -04:00
Brad King b7b4ace2be Merge topic 'UseSWIG-fix-genex' 
88dd5dc9ff UseSWIG: add support for generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2143
 2018-06-13 10:48:04 -04:00
Brad King 3b7da49d55 Merge topic 'UseSWIG-handle-SWIG_MODULE_NAME' 
156138d5f1 UseSWIG: Fix handling of `SWIG_MODULE_NAME` source file property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2145
 2018-06-13 10:47:06 -04:00
Brad King 49c30fc65c Merge branch 'release-3.11' 2018-06-13 10:45:29 -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
Rishi Theivendran 0c2fb4c896 UseSWIG: Add CSHARP variant for wrapper files 
Issue: #18065
Fixes: #18066
 2018-06-12 11:34:58 -04:00
Brad King 051e0be742 Merge branch 'restore-windows-resources-through-link' into release-3.11 
Merge-request: !2147
 2018-06-12 11:19:07 -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
Brad King f024f4f8a0 Merge branch 'UseSWIG-fix-genex' into release-3.12 
Merge-request: !2143
 2018-06-12 10:08:36 -04:00
Marc Chevrier 88dd5dc9ff UseSWIG: add support for generator expressions 2018-06-12 10:07:24 -04:00
Brad King 3dd046a84b Merge branch 'UseSWIG-handle-SWIG_MODULE_NAME' into release-3.12 
Merge-request: !2145
 2018-06-12 10:00:41 -04:00
Felix Schwitzer 156138d5f1 UseSWIG: Fix handling of SWIG_MODULE_NAME source file property 
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`.
 2018-06-12 09:55:53 -04:00
Brad King 71f58d6bf7 Merge branch 'release-3.12' 2018-06-12 09:51:06 -04:00
Brad King c8868d727c Merge topic 'FindPython-3.8' 
b6e7f2c37f FindPython: Add support for version 3.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2140
 2018-06-12 09:49:05 -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 1f3221f365 Merge branch 'FindPython-3.8' into release-3.12 
Merge-request: !2140
 2018-06-08 09:42:29 -04:00
Marcel Plch b6e7f2c37f FindPython: Add support for version 3.8 
Python 3.7 is about to be released, making the development version 3.8.
 2018-06-08 09:42:18 -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 e9f2a29fee Merge branch 'release-3.12' 2018-06-08 09:35:10 -04:00
Brad King 4d1a643481 Merge topic 'CMakePackageConfigHelpers-doc' 
aeda8fcceb Help: Package without components should use 'check_required_components' too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2138
 2018-06-08 09:34:26 -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
Brad King c984bf668b Merge branch 'ninja-win-rsp' into release-3.12 
Merge-request: !2136
 2018-06-08 09:32:14 -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