mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 11:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
36,912 Commits 2 Branches 401 Tags
ef978c1dea9fa3f2decadd5145c643d90af40f61
Commit Graph

36912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Pfeifer ef978c1dea CursesDialog: use target_include_directories for cmForm 2017-08-18 22:25:20 +02:00
Daniel Pfeifer 7814d75023 bootstrap: make target_* commands available 2017-08-18 21:48:14 +02:00
Kitware Robot 10edb0c7d5 CMake Nightly Date Stamp 2017-08-18 00:01:08 -04:00
Craig Scott 999192b0f7 Merge topic 'perf-targetIterAndLookup-cmLocalGenerator' 
af3fd6f2 Performance: Add an index to Change cmLocalGenerator::GeneratorTargets.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1136
 2017-08-17 16:38:24 -04:00
Kitware Robot d3760354a5 CMake Nightly Date Stamp 2017-08-17 00:01:06 -04:00
Aaron Orenstein af3fd6f22f Performance: Add an index to Change cmLocalGenerator::GeneratorTargets. 
Add an index to Change cmLocalGenerator::GeneratorTargets for faster lookup by
name.

Also changed a bunch of uses of cmLocalGenerator::GetGeneratorTargets() to take
const references instead of copying the vector.

Represent generator targets as a map (name -> target) to make name lookups more
efficient instead of looping through the entire vector to find the desired one.
 2017-08-16 15:35:38 -07:00
Brad King f59d8e5982 Merge topic 'CPackRPM-new-debuginfo' 
48fa4c0d CPackRPM: Restore old style debuginfo creation for rpm >= 4.14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1099
 2017-08-16 11:05:12 -04:00
Brad King a2405b4378 Merge topic 'lint-fixes' 
cbcf6458 cmServerProtocol: Do not move into json::Value::append()
91417e4c cmServerProtocol: pass cmBacktraceRange by value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1143
 2017-08-16 10:51:48 -04:00
Brad King d817bbb8df Merge topic 'string_prepend' 
d8ecc254 Add PREPEND sub-command to string command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1129
 2017-08-16 10:50:38 -04:00
Brad King 75b3866a8e Merge topic 'ice-3.7.0' 
5868be86 FindIce: Add support for Ice 3.7.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1137
 2017-08-16 10:50:22 -04:00
Brad King 6ffb0f9d05 Merge branch 'release-3.9' 2017-08-16 10:48:20 -04:00
Brad King b034e22f36 Merge topic 'FindCygwin-fix-regression' 
a428b87c Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regression
62930253 FindCygwin: Fix regression when CYGWIN_INSTALL_PATH is already set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1128
 2017-08-16 10:47:38 -04:00
Brad King 867b061153 Merge topic 'debian_clang_binutils' 
630235bd Clang: Find version-suffixed LLVM/Clang binutils

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1127
 2017-08-16 10:47:10 -04:00
Brad King 472acc890f Merge topic 'cuda-device-link-ccbin' 
fe45d13a CUDA: Pass host compiler to nvcc while device linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1138
 2017-08-16 10:46:42 -04:00
Brad King 1e77d0dbef Merge topic 'autogen-autouic-lookup' 
6c5e03d6 Merge branch 'backport-autogen-autouic-lookup' into autogen-autouic-lookup
fb5db079 Autogen: Extend AUTOUIC search paths test
d8a99dd2 Autogen: Update AUTOUIC documentation for search paths
02e6c548 Autogen: Restore AUTOUIC lookup paths from 3.8.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1140
 2017-08-16 10:43:17 -04:00
Björn Esser 48fa4c0d1a CPackRPM: Restore old style debuginfo creation for rpm >= 4.14 2017-08-16 11:21:37 +02:00
Kitware Robot 131af5d591 CMake Nightly Date Stamp 2017-08-16 00:01:07 -04:00
Daniel Pfeifer cbcf6458f4 cmServerProtocol: Do not move into json::Value::append() 
CMake's copy of json-cpp is not aware of rvalues yet.  It is confusing
to pass the result of std::move to a function that takes a const&
because no move will actually happen.  This change may be reverted once
CMake upgrades to a new version of json-cpp.
 2017-08-15 22:43:08 +02:00
Daniel Pfeifer 91417e4ca3 cmServerProtocol: pass cmBacktraceRange by value 2017-08-15 22:37:05 +02:00
Brad King f78228dfd5 Merge branch 'debian_clang_binutils' into release-3.9 
Merge-request: !1127
 2017-08-15 14:53:58 -04:00
Sylvain Joubert 630235bd9e Clang: Find version-suffixed LLVM/Clang binutils 
Debian renames all LLVM/Clang binaries with a version suffix to allow
multiple versions to be installed at the same time.  While there is a
version-agnostic package that adds a symlink to provide the standard
binary names, if only the versioned packages are installed, binaries
must be found as `binary-x.y`.  In any case, using the same version of
the `binutils` as the compiler seems better.
 2017-08-15 14:51:44 -04:00
Brad King d4b8a6b9d6 Merge branch 'cuda-device-link-ccbin' into release-3.9 
Merge-request: !1138
 2017-08-15 14:47:21 -04:00
Maikel van den Hurk fe45d13a0e CUDA: Pass host compiler to nvcc while device linking 2017-08-15 14:46:11 -04:00
Brad King 752ab27292 Merge branch 'backport-FindCygwin-fix-regression' into release-3.9 
Merge-request: !1128
 2017-08-15 14:00:59 -04:00
Brad King 1622848efc Merge branch 'backport-autogen-autouic-lookup' into release-3.9 
Merge-request: !1140
 2017-08-15 14:00:29 -04:00
Brad King a428b87ccf Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regression 2017-08-15 13:55:54 -04:00
Tibor Szabo 62930253a3 FindCygwin: Fix regression when CYGWIN_INSTALL_PATH is already set 
The change in commit v3.9.0-rc1~54^2 (FindCygwin: Use find_program
instead of find_path, 2017-05-18) broke cases when `CYGWIN_INSTALL_PATH`
is already set, e.g. on the command-line or by an earlier call to
`find_package(Cygwin)`.  Since `find_program` now finds the actual
`cygwin.bat` file, use a separate cache entry to save the location
and then compute `CYGWIN_INSTALL_PATH`.  If `CYGWIN_INSTALL_PATH`
is already set, use that to avoid `find_program` having to search.
 2017-08-15 13:53:10 -04:00
Brad King 6c5e03d6d4 Merge branch 'backport-autogen-autouic-lookup' into autogen-autouic-lookup 2017-08-15 13:23:11 -04:00
Brad King 8ebd590b21 Merge topic 'cpack-deb-ipk' 
a17ef574 CPackDeb: Loosen filename requirement to allow for .ipk

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1093
 2017-08-15 13:19:53 -04:00
Brad King f2cab9855b Merge topic 'server-allow-cache' 
9b3c5ccf Server: test cache after reconnect
1df38758 cmServerProtocol: allow 'cache' request before 'configure'
187332b2 cmServerProtocol: fix test of empty values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !977
 2017-08-15 13:17:49 -04:00
Brad King 8cfd52981d Merge topic 'autogen-less-verbose' 
53640a46 Autogen: Only print Qt Autogenerator messages when verbose

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1133
 2017-08-15 13:16:35 -04:00
Brad King e1c92163d3 Merge topic 'update-kwsys' 
060cef0c Merge branch 'upstream-KWSys' into update-kwsys
9e002621 KWSys 2017-08-11 (e1006189)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1130
 2017-08-15 13:09:40 -04:00
Brad King 683dbfe14d Merge topic 'require-cmake-3.1' 
fb0c3c56 Require CMake 3.1 to build CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !1126
 2017-08-15 13:09:20 -04:00
Brad King 8fb9a5770a Merge topic 'cpackifw-package-file-extension' 
45623e72 CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !1117
 2017-08-15 13:08:26 -04:00
Sebastian Holtermann fb5db079a7 Autogen: Extend AUTOUIC search paths test 2017-08-15 13:22:18 +02:00
Sebastian Holtermann d8a99dd2ea Autogen: Update AUTOUIC documentation for search paths 2017-08-15 12:57:32 +02:00
Sebastian Holtermann 02e6c54813 Autogen: Restore AUTOUIC lookup paths from 3.8.2 
When encountering an `#include "<PATH>ui_<BASE>.h"` statement,
search for `<BASE>.ui` in
 - <SOURCE_DIR>/<BASE>.ui
 - <SOURCE_DIR>/<PATH><BASE>.ui
 - <AUTOUIC_SEARCH_PATH>/<BASE>.ui
 - <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui

In CMake 3.8.2 the lookup list was
  - <SOURCE_DIR>/<BASE>.ui

In CMake 3.9.[01] the lookup list was
 - <SOURCE_DIR>/<PATH><BASE.ui>
 - <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui

Closes #17168
 2017-08-15 12:17:37 +02:00
Kitware Robot 4ca8c08f36 CMake Nightly Date Stamp 2017-08-15 00:01:04 -04:00
Kitware Robot ce2750817b CMake Nightly Date Stamp 2017-08-14 00:01:07 -04:00
Daniel Pfeifer 9b3c5ccf12 Server: test cache after reconnect 2017-08-13 23:20:11 +02:00
Daniel Pfeifer 1df3875871 cmServerProtocol: allow 'cache' request before 'configure' 
Fixes: #16989
 2017-08-13 22:02:31 +02:00
Daniel Pfeifer 187332b2fa cmServerProtocol: fix test of empty values 
If a required value is in the cache, it is not necessary to set it
explicitly.

Fixes: #16948, #16988
 2017-08-13 22:02:30 +02:00
Craig Scott e6ca528be3 Merge topic 'cpack-CPACK_COMPONENTS_ALL-extra-docs' 
d2c9efa9 CPack: additional CPACK_COMPONENTS_ALL documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1134
 2017-08-13 06:59:01 -04:00
Kitware Robot 02f6bb1a81 CMake Nightly Date Stamp 2017-08-13 00:01:04 -04:00
Nils Gladitz a17ef5748a CPackDeb: Loosen filename requirement to allow for .ipk 
The OPKG packaging system uses deb like package files with
an .ipk extension. Allow the DEB generator to be used in that context.
 2017-08-12 17:27:06 +02:00
Domen Vrankar d2c9efa947 CPack: additional CPACK_COMPONENTS_ALL documentation 2017-08-12 10:54:27 +02:00
Matthias Kuhn 53640a4610 Autogen: Only print Qt Autogenerator messages when verbose 
Unconditionally printing these messages prevents ninja builds from
filtering successful commands and only show errors and warnings.

Fix #17157
 2017-08-12 09:29:36 +02:00
Kitware Robot e4f16a06ab CMake Nightly Date Stamp 2017-08-12 00:01:12 -04:00
Roger Leigh 5868be8677 FindIce: Add support for Ice 3.7.0 
- Search for NuGet packages on Windows, which is the new way the
  official binary builds are distributed for 3.7.0
- Search for C++11 versions of libraries, with "++11" suffix,
  taking Windows naming inconsistencies into account (Windows
  libraries have a "37" suffix, but this is placed /before/
  the "++11".
- Add new Ice 3.7 programs
- Document new Ice 3.7 components
- Add debug output for search suffixes
- Simplify debug logic
 2017-08-12 01:12:46 +01:00
Brad King 060cef0c44 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-08-11 (e1006189)
 2017-08-11 10:13:23 -04:00