summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2017-11-271-1/+1
|
* CMake Nightly Date StampKitware Robot2017-11-261-1/+1
|
* CMake Nightly Date StampKitware Robot2017-11-251-1/+1
|
* CMake Nightly Date StampKitware Robot2017-11-241-1/+1
|
* CMake Nightly Date StampKitware Robot2017-11-231-1/+1
|
* Merge topic 'WriteBasicConfigVersionFile_SameMinorVersion'Craig Scott2017-11-225-13/+147
|\ | | | | | | | | | | | | | | | | d18ff3a5 WriteBasicConfigVersionFile: Fix messages in ExactVersion tests 16a93de0 WriteBasicConfigVersionFile: Add SameMinorVersion COMPATIBILITY option Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Claudio <claudio.fantacci@gmail.com> Merge-request: !1507
| * WriteBasicConfigVersionFile: Fix messages in ExactVersion testsDaniele E. Domenichelli2017-11-211-6/+6
| |
| * WriteBasicConfigVersionFile: Add SameMinorVersion COMPATIBILITY optionDaniele E. Domenichelli2017-11-215-7/+141
| |
* | CMake Nightly Date StampKitware Robot2017-11-221-1/+1
| |
* | Merge topic 'gtest-fix-discovery'Brad King2017-11-215-5/+67
|\ \ | | | | | | | | | | | | | | | | | | 70f9f62d GoogleTest: Fix multiple discovery on same target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1510
| * | GoogleTest: Fix multiple discovery on same targetMatthew Woehlke2017-11-215-5/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the documentation, tests can be discovered for a target multiple times by using a different prefix and/or suffix to ensure name uniqueness. However, while this worked for gtest_add_tests, it did not work with gtest_discover_tests because the generated file that sets up the tests was named based only on the target name, and so subsequent discovery from the same target would clobber earlier discovery. Fix this by introducing a counter that records how many times discovery has been used on a target, and use this to generate unique names of the generated test list files.
* | | Merge topic 'irsl-intel-1041-folder'Christian Pfeiffer2017-11-211-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8e7e7af5 IRSL: Install the 1041 folder for Intel compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1509
| * | | IRSL: Install the 1041 folder for Intel compilersChristian Pfeiffer2017-11-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The presence of the `1041` seems to solely depend on whether a given Intel compiler release was available in Japanese or not. Install it if it is present and silently ignore it otherwise. Example: The Intel 2018.0 release did not ship it, but the 2018.1 compilers have it.
* | | | Merge topic 'findqt4-dirs-fix'Christian Pfeiffer2017-11-211-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f81d186b FindQt4: Set PLUGINS and IMPORTS dir even if empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1503
| * | | | FindQt4: Set PLUGINS and IMPORTS dir even if emptyChristian Pfeiffer2017-11-191-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #14155 Issue: #17492
* | | | | Merge topic 'wxwidgets-env-variables'Christian Pfeiffer2017-11-212-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b503cc8 wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1504
| * | | | | wxWidgets: Respect WX_CONFIG and WXRC_CMD env varsChristian Pfeiffer2017-11-192-4/+6
| |/ / / / | | | | | | | | | | | | | | | Issue: #17492
* | | | | Merge topic 'imagemagick-6-freebsd-names'Christian Pfeiffer2017-11-211-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35b8a26b FindImageMagick: Add more library names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1505
| * | | | | FindImageMagick: Add more library namesChristian Pfeiffer2017-11-201-0/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The port maintainers on FreeBSD normalize the library names to not include the bit and HDRI options. Furthermore, `--quantum-depth=32` and `--quantum-depth=64` will yield `Q32` and `Q64` suffixes in the library names. Issue: #17492
* | | | | CMake Nightly Date StampKitware Robot2017-11-211-1/+1
| | | | |
* | | | | Merge topic 'tidy-sha1-comment'Brad King2017-11-201-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08353542 clang-tidy: Clarify comment explaining purpose of CLANG_TIDY_SHA1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1497
| * | | | | clang-tidy: Clarify comment explaining purpose of CLANG_TIDY_SHA1Brad King2017-11-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Suggested-by: Bill Hoffman <bill.hoffman@kitware.com>
* | | | | | Merge branch 'release-3.10'Brad King2017-11-200-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | CMake 3.10.0v3.10.0Brad King2017-11-201-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.10'Brad King2017-11-200-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'fix-cmake-server-bad-buffering' into release-3.10Brad King2017-11-201-3/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1498
* | \ \ \ \ \ Merge topic 'fix-cmake-server-bad-buffering'Brad King2017-11-201-3/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01c42155 server: Fix regression in partial message handling Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: jdavidberger <j.david.berger@gmail.com> Merge-request: !1498
| * | | | | | server: Fix regression in partial message handlingvector-of-bool2017-11-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a partial message is flushed into the input pipe for CMake Server, the parser will try and parse it as a full message because of some bad loop checks. This was introduced accidentally in commit v3.10.0-rc1~365^2~2 (server: Refactor to make the event loop owned by server object, 2017-03-24).
* | | | | | | Merge topic 'autogen-rcc-custom-command'Brad King2017-11-2017-1665/+2015
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40434631 Autogen: Use integers instead of strings for the Qt version be11a852 Autogen: Use project relative paths in rcc custom command comment ab9d5896 Autogen: Detect rcc feature once during configuration 2a85b5ac Autogen: Make cmQtAutoGeneratorInitializer an instantiable class 75819b86 Autogen: Add and use cmQtAutoGenerator base class 27ed3b35 Autogen: Rename cmQtAutoGenerators to cmQtAutoGeneratorMocUic 1cd285fe Autogen: Remove rcc code from cmQtAutoGenerators a87f82e0 Autogen: Switch to use custom commands for RCC ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1494
| * | | | | | | Autogen: Use integers instead of strings for the Qt versionSebastian Holtermann2017-11-194-17/+9
| | | | | | | |
| * | | | | | | Autogen: Use project relative paths in rcc custom command commentSebastian Holtermann2017-11-191-1/+21
| | | | | | | |
| * | | | | | | Autogen: Detect rcc feature once during configurationSebastian Holtermann2017-11-197-103/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to detect the `rcc` features before every `rcc` list invocation wich resulted in `rcc` be called twice for every listing operation. Now we detect the `rcc` list capabilities once during configuration and pass it to the cmake_autorcc target in the info file.
| * | | | | | | Autogen: Make cmQtAutoGeneratorInitializer an instantiable classSebastian Holtermann2017-11-198-759/+713
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the cmQtAutoGenDigest classes and make cmQtAutoGeneratorInitializer instantiable instead.
| * | | | | | | Autogen: Add and use cmQtAutoGenerator base classSebastian Holtermann2017-11-199-759/+488
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the new base class `cmQtAutoGenerator` which contains common variables and methods used by `cmQtAutoGeneratorMocUic` and `cmQtAutoGeneratorRcc`.
| * | | | | | | Autogen: Rename cmQtAutoGenerators to cmQtAutoGeneratorMocUicSebastian Holtermann2017-11-194-76/+76
| | | | | | | |
| * | | | | | | Autogen: Remove rcc code from cmQtAutoGeneratorsSebastian Holtermann2017-11-193-314/+1
| | | | | | | |
| * | | | | | | Autogen: Switch to use custom commands for RCCSebastian Holtermann2017-11-193-209/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of processing all `rcc` invocation requests in the _autogen target that calls `cmake -E cmake_autogen ...` once, use a dedicated custom command that calls `cmake -E cmake_autorcc ...` for each `.qrc` file. This allows parallel `.qrc` file processing and reduces the workload (and complexity) in the _autogen target. If only `AUTORCC` is enabled, the _autogen target won't be created at all since it is now used for `AUTOMOC` and `AUTOUIC` only. For `.qrc` files that are GENERATED a custom target is used instead of a custom command. Closes #17161
| * | | | | | | Autogen: Introduce standalone RCC generator classSebastian Holtermann2017-11-194-4/+844
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces the standalone RCC generator class `cmQtAutoGeneratorRcc`. Every instance of `cmQtAutoGeneratorRcc` class handles the `rcc` invocation for a single `.qrc` file. The class will be used in the future to allow parallel `.qrc` file processing by calling `cmake -E cmake_autorcc <INFO_FILE> <CONFIG>`.
* | | | | | | Merge topic 'cpack-minor-cleanup-and-tests-extension'Brad King2017-11-2033-68/+152
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 325f34d1 CPack tests: add possibility for expecting config developer warnings 176281e1 CPack test: correctly handle CPACK_PACKAGING_INSTALL_PREFIX cf0c2599 CPack: set variable commands in lower case 2ff906b3 CPack: documentation typo fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1499
| * | | | | | | CPack tests: add possibility for expecting config developer warningsDomen Vrankar2017-11-192-1/+28
| | | | | | | |
| * | | | | | | CPack test: correctly handle CPACK_PACKAGING_INSTALL_PREFIXDomen Vrankar2017-11-1930-65/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every CPack generator sets default CPACK_PACKAGING_INSTALL_PREFIX variable value differently so test framework should support that correctly - previous version expected RPM/Deb /usr default and removed it for Archive packagers as the default there is /.
| * | | | | | | CPack: set variable commands in lower caseDomen Vrankar2017-11-191-1/+1
| | | | | | | |
| * | | | | | | CPack: documentation typo fixDomen Vrankar2017-11-191-1/+1
| |/ / / / / /
* | | | | | | Merge topic 'ctest-chrono'Brad King2017-11-2010-33/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fd979a8 CTest: adopt std::chrono::system_clock Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1487
| * | | | | | | CTest: adopt std::chrono::system_clockWouter Klouwen2017-11-1710-33/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the refactor to make CTest use std::chrono::steady_clock for the keeping of time for test duration, there are still references to cmSystemTools::GetTime() left. To further adopt std::chrono for time related activities, this commit changes those remaining references to std::chrono::system_clock::now() calls and alters the storage from either unsigned int or double to std::chrono::system_clock::time_point. For ease of conversion, a converter method is added to cmXMLWriter that converts from a std::chrono::system_clock::time_point to the number of seconds since the UN*X epoch as that is expected behaviour. This means no more casts as required. Functionally should be no difference as the system_clock is implemented in the same terms.
* | | | | | | | Merge topic 'cuda-sep-comp-var'Brad King2017-11-206-0/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00e13993 CUDA: Add CMAKE_CUDA_SEPARABLE_COMPILATION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexander Korsunsky <a.korsunsky@gmail.com> Merge-request: !1495
| * | | | | | | | CUDA: Add CMAKE_CUDA_SEPARABLE_COMPILATION variableBrad King2017-11-176-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use its value to initialize the `CUDA_SEPARABLE_COMPILATION` target property when targets are created. Fixes: #17478
* | | | | | | | | Merge topic 'iwyu-suppress-clang-warnings'Brad King2017-11-201-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be592b23 IWYU: Suppress warnings from the internal Clang Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1496
| * | | | | | | | | IWYU: Suppress warnings from the internal ClangBrad King2017-11-171-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not obscure IWYU's report with warnings from its internal Clang. We have other testing for such warnings. Also, when compiling with a non-Clang compiler we might use warning options that IWYU's Clang does not understand, and we don't want to see warnings about that.
* | | | | | | | | Merge topic 'perf-source-lookup'Brad King2017-11-208-40/+84
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a6348db Performance: Improve efficiency of source file lookup in cmMakefile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1421