summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'autogen-macro-names'Brad King2017-08-2117-15/+150
|\ | | | | | | | | | | | | | | | | | | b3d98c6e Autogen: Add release notes for AUTOMOC_MACRO_NAMES 7529d84f Autogen: Add documentation for AUTOMOC_MACRO_NAMES 05891d8f Autogen: Add test for AUTOMOC_MACRO_NAMES 93f0ba28 Autogen: Add AUTOMOC_MACRO_NAMES support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1156
| * Autogen: Add release notes for AUTOMOC_MACRO_NAMESSebastian Holtermann2017-08-181-0/+12
| |
| * Autogen: Add documentation for AUTOMOC_MACRO_NAMESSebastian Holtermann2017-08-186-5/+62
| |
| * Autogen: Add test for AUTOMOC_MACRO_NAMESSebastian Holtermann2017-08-185-0/+52
| |
| * Autogen: Add AUTOMOC_MACRO_NAMES supportSebastian Holtermann2017-08-185-10/+24
| | | | | | | | Closes #17176
* | Merge topic 'bootstrap-target-commands'Brad King2017-08-214-25/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | ef978c1d CursesDialog: use target_include_directories for cmForm 7814d750 bootstrap: make target_* commands available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1158
| * | CursesDialog: use target_include_directories for cmFormDaniel Pfeifer2017-08-182-11/+10
| | |
| * | bootstrap: make target_* commands availableDaniel Pfeifer2017-08-182-14/+20
| |/
* | Merge topic 'vs-less-c_str'Brad King2017-08-211-58/+53
|\ \ | | | | | | | | | | | | | | | | | | 79064819 VS: remove unnecessary c_str() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1151
| * | VS: remove unnecessary c_str()Vitaly Stakhovsky2017-08-171-58/+53
| | |
* | | Merge topic 'findcuda_dont_quote_COMPILE_DEFINITIONS'Brad King2017-08-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c1f4f13d FindCUDA: Use long brackets to handle spaces in CUDA_NVCC_COMPILE_DEFINITIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1139
| * | | FindCUDA: Use long brackets to handle spaces in CUDA_NVCC_COMPILE_DEFINITIONSRobert Maynard2017-08-151-1/+1
| | | | | | | | | | | | | | | | Fixes #16510. Quoting of compile definitions breaks string value definitions
* | | | Merge topic 'bootstrap'Brad King2017-08-211-56/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d12837af bootstrap: Require a standard C compiler dc0befb6 bootstrap: Remove check that identifies GNU compiler 6fdcf02a bootstrap: remove dead branches Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1142
| * | | | bootstrap: Require a standard C compilerDaniel Pfeifer2017-08-161-21/+12
| | | | |
| * | | | bootstrap: Remove check that identifies GNU compilerDaniel Pfeifer2017-08-151-25/+0
| | | | | | | | | | | | | | | | | | | | Bootstrapping no longer depends on this information.
| * | | | bootstrap: remove dead branchesDaniel Pfeifer2017-08-151-10/+0
| | | | | | | | | | | | | | | | | | | | Remove code that uses cmake_cxx_compiler_is_gnu before it is set.
* | | | | Merge topic 'bootstrap-grep-solaris'Brad King2017-08-211-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e488c7f9 bootstrap: Restore output redirection instead of "grep -q" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1144
| * | | | | bootstrap: Restore output redirection instead of "grep -q"Brad King2017-08-161-10/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | This reverts commit 567bac890c (bootstrap: use "grep -q" instead of output redirection, 2017-06-07). On Solaris `grep -q` does not exist.
* | | | | Merge topic 'require-c++11'Brad King2017-08-215-42/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd4fd9a2 Require C++11 to build CMake itself Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1132
| * | | | | Require C++11 to build CMake itselfBrad King2017-08-165-42/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake can now compile as C++11 on all supported platforms. Check that std::unique_ptr is available and fail early if missing. This will allow us to use C++11 more broadly in CMake's implementation (previously it was restricted to the serve mode implementation). Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
* | | | | | CMake Nightly Date StampKitware Robot2017-08-211-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-08-201-1/+1
| | | | | |
* | | | | | Merge topic 'typo_doc_if_command'Craig Scott2017-08-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9ed29b7 Help: Fix formatting typo for the 'if' command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1155
| * | | | | | Help: Fix formatting typo for the 'if' commandSylvain Joubert2017-08-181-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-08-191-1/+1
|/ / / / /
* | | | | CMake Nightly Date StampKitware Robot2017-08-181-1/+1
| | | | |
* | | | | Merge topic 'perf-targetIterAndLookup-cmLocalGenerator'Craig Scott2017-08-1714-57/+71
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | af3fd6f2 Performance: Add an index to Change cmLocalGenerator::GeneratorTargets. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1136
| * | | | Performance: Add an index to Change cmLocalGenerator::GeneratorTargets.Aaron Orenstein2017-08-1614-57/+71
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | CMake Nightly Date StampKitware Robot2017-08-171-1/+1
| | | |
* | | | 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
| |/ / / / / / / /