summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: Fix references to source files in gfortran diagnosticsRaul Laasner2017-08-232-1/+9
| | | | | | | | | The Ninja generator preprocesses and compiles separately for Fortran. When compiling, tell gfortran that the source is already preprocessed so that it will honor the `# <line>` directives when producing diagnostics messages. Fixes: #17160
* Merge topic 'CPackRPM-new-debuginfo'Brad King2017-08-161-2/+10
|\ | | | | | | | | | | | | 48fa4c0d CPackRPM: Restore old style debuginfo creation for rpm >= 4.14 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1099
| * CPackRPM: Restore old style debuginfo creation for rpm >= 4.14Björn Esser2017-08-161-2/+10
| |
* | Merge topic 'lint-fixes'Brad King2017-08-161-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | cmServerProtocol: Do not move into json::Value::append()Daniel Pfeifer2017-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | 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.
| * | cmServerProtocol: pass cmBacktraceRange by valueDaniel Pfeifer2017-08-151-1/+1
| | |
* | | Merge topic 'string_prepend'Brad King2017-08-169-0/+108
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d8ecc254 Add PREPEND sub-command to string command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1129
| * | | Add PREPEND sub-command to string commandSylvain Joubert2017-08-119-0/+108
| | | |
* | | | Merge topic 'ice-3.7.0'Brad King2017-08-161-124/+182
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5868be86 FindIce: Add support for Ice 3.7.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1137
| * | | | FindIce: Add support for Ice 3.7.0Roger Leigh2017-08-121-124/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | Merge branch 'release-3.9'Brad King2017-08-160-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'debian_clang_binutils' into release-3.9Brad King2017-08-151-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1127
| * \ \ \ \ \ Merge branch 'cuda-device-link-ccbin' into release-3.9Brad King2017-08-151-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1138
| * \ \ \ \ \ \ Merge branch 'backport-FindCygwin-fix-regression' into release-3.9Brad King2017-08-151-5/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1128
| * \ \ \ \ \ \ \ Merge branch 'backport-autogen-autouic-lookup' into release-3.9Brad King2017-08-159-28/+169
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1140
* | \ \ \ \ \ \ \ \ Merge topic 'FindCygwin-fix-regression'Brad King2017-08-161-5/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regressionBrad King2017-08-151-5/+8
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | FindCygwin: Fix regression when CYGWIN_INSTALL_PATH is already setTibor Szabo2017-08-151-5/+8
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge topic 'debian_clang_binutils'Brad King2017-08-161-0/+8
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 630235bd Clang: Find version-suffixed LLVM/Clang binutils Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1127
| * | | | | | | | Clang: Find version-suffixed LLVM/Clang binutilsSylvain Joubert2017-08-151-0/+8
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'cuda-device-link-ccbin'Brad King2017-08-161-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | CUDA: Pass host compiler to nvcc while device linkingMaikel van den Hurk2017-08-151-2/+2
| |/ / / / / /
* | | | | | | Merge topic 'autogen-autouic-lookup'Brad King2017-08-169-28/+171
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge branch 'backport-autogen-autouic-lookup' into autogen-autouic-lookupBrad King2017-08-159-28/+171
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | Autogen: Extend AUTOUIC search paths testSebastian Holtermann2017-08-156-1/+105
| | | | | |
| | * | | | Autogen: Update AUTOUIC documentation for search pathsSebastian Holtermann2017-08-151-6/+13
| | | | | |
| | * | | | Autogen: Restore AUTOUIC lookup paths from 3.8.2Sebastian Holtermann2017-08-152-21/+51
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | CMake Nightly Date StampKitware Robot2017-08-161-1/+1
|/ / / /
* | | | Merge topic 'cpack-deb-ipk'Brad King2017-08-151-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a17ef574 CPackDeb: Loosen filename requirement to allow for .ipk Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1093
| * | | | CPackDeb: Loosen filename requirement to allow for .ipkNils Gladitz2017-08-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The OPKG packaging system uses deb like package files with an .ipk extension. Allow the DEB generator to be used in that context.
* | | | | Merge topic 'server-allow-cache'Brad King2017-08-157-29/+89
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Server: test cache after reconnectDaniel Pfeifer2017-08-135-15/+77
| | | | | |
| * | | | | cmServerProtocol: allow 'cache' request before 'configure'Daniel Pfeifer2017-08-132-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16989
| * | | | | cmServerProtocol: fix test of empty valuesDaniel Pfeifer2017-08-132-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a required value is in the cache, it is not necessary to set it explicitly. Fixes: #16948, #16988
* | | | | | Merge topic 'autogen-less-verbose'Brad King2017-08-151-6/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53640a46 Autogen: Only print Qt Autogenerator messages when verbose Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1133
| * | | | | | Autogen: Only print Qt Autogenerator messages when verboseMatthias Kuhn2017-08-121-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unconditionally printing these messages prevents ninja builds from filtering successful commands and only show errors and warnings. Fix #17157
* | | | | | | Merge topic 'update-kwsys'Brad King2017-08-155-40/+159
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 060cef0c Merge branch 'upstream-KWSys' into update-kwsys 9e002621 KWSys 2017-08-11 (e1006189) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1130
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-08-115-40/+159
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-08-11 (e1006189)
| | * | | | | | KWSys 2017-08-11 (e1006189)KWSys Upstream2017-08-115-40/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit e100618908f7f7a41cbe623afa79ca0e4f17834a (master). Upstream Shortlog ----------------- Chuck Atkins (2): 993f0ea4 Add an option to split object and interface libs. b61faf89 Fix install rules and usage requirements for interface+object libs Justin Berger (2): 6d73752d Allow KWSYSPE_USE_SELECT macro to be overriden at compile time. da61baff Added cmake settable property to enable the macro Sean McBride (1): dfa13188 Fixed a couple of trivial clang -Wunused-macros warnings Shawn Waldon (1): da8a9e65 SystemTools: make GetFilenameName handle either kind of slash
* | | | | | | | Merge topic 'require-cmake-3.1'Brad King2017-08-153-24/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Require CMake 3.1 to build CMake itselfBrad King2017-08-103-24/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies some policy settings and use of third-party libraries with imported targets.
* | | | | | | | | Merge topic 'cpackifw-package-file-extension'Brad King2017-08-154-12/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variableKonstantin Podsvirov2017-08-094-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable to customize target binary format.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-08-151-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-08-141-1/+1
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'cpack-CPACK_COMPONENTS_ALL-extra-docs'Craig Scott2017-08-131-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2c9efa9 CPack: additional CPACK_COMPONENTS_ALL documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1134
| * | | | | | | | | CPack: additional CPACK_COMPONENTS_ALL documentationDomen Vrankar2017-08-121-0/+10
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-08-131-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-08-121-1/+1
|/ / / / / / / /
* | | | | | | | Merge topic 'github-pr-template'Brad King2017-08-111-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7983e068 Add GitHub PR template to point contributors at CONTRIBUTING.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !1125
generated by cgit v0.12 at 2024-12-27 14:47:12 (GMT)