summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'msvc_cuda_files_use_consistent_obj_names'Brad King2018-01-317-26/+51
|\ | | | | | | | | | | | | fa583869 CUDA: Use MSVC default pattern for naming object files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1722
| * CUDA: Use MSVC default pattern for naming object filesRobert Maynard2018-01-307-26/+51
| | | | | | | | | | The default that CUDA uses causes failures when you try to embed CUDA obj's into another target.
* | Merge topic 'generate_speedup'Brad King2018-01-312-29/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | aed227fd cmLocalGenerator: change ImportedGeneratorTargets from vector to map 4443adc1 cmLocalGenerator: remove public GetImportedGeneratorTargets Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Attila Krasznahorkay <attila.krasznahorkay@gmail.com> Merge-request: !1717
| * | cmLocalGenerator: change ImportedGeneratorTargets from vector to mapFrank Winklmeier2018-01-302-24/+6
| | | | | | | | | | | | | | | | | | | | | | | | For large number of targets significant amount of time is spent in cmLocalGenerator::FindGeneratorTargetToUse, which uses find_if on a vector to locate the given target. Using a map instead of vector for ImportedGeneratorTargets (as done for cmMakefile::ImportedTargets) provides a significant speedup (up to factor of 2).
| * | cmLocalGenerator: remove public GetImportedGeneratorTargetsFrank Winklmeier2018-01-301-5/+0
| |/ | | | | | | | | GetImportedGeneratorTargets is not used anywhere hence remove it to avoid exposing the type of ImportedGeneratorTargets.
* | Merge topic 'source_group-TREE-args'Brad King2018-01-316-91/+181
|\ \ | | | | | | | | | | | | | | | | | | 365e02e7 source_group: Fix TREE argument parsing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1713
| * | source_group: Fix TREE argument parsingMateusz Janek2018-01-306-91/+181
| | | | | | | | | | | | Fixes: #17581
* | | Merge topic 'CheckIPOSupported-doc-Fortran'Brad King2018-01-311-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9e341f05 CheckIPOSupported: Document existing Fortran support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1727
| * | | CheckIPOSupported: Document existing Fortran supportBrad King2018-01-301-1/+1
| | |/ | |/| | | | | | | | | | Support was added by commit v3.9.0-rc1~318^2 (CheckIPOSupported: Add Fortran support, 2017-04-02) but the documentation was not updated.
* | | Merge topic 'vs-restore-order'Brad King2018-01-311-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1fe66c46 VS: Restore the order of the AdditionalIncludeDirectories tag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1719
| * | | VS: Restore the order of the AdditionalIncludeDirectories tagVitaly Stakhovsky2018-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the `AdditionalIncludeDirectories` tag back to the VS-preferred location in `.vcxproj` files. Fixes: #17691
* | | | Merge topic 'dedup-ComputeObjectFilenames'Brad King2018-01-316-38/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79f22e84 Makefile,Ninja: De-duplicate ComputeObjectFilenames method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1715
| * | | | Makefile,Ninja: De-duplicate ComputeObjectFilenames methodBrad King2018-01-296-38/+21
| |/ / / | | | | | | | | | | | | | | | | Move the method implementation up to `cmLocalCommonGenerator` to avoid duplicating it in each generator.
* | | | Merge topic 'adsp-asmembler-identification'Brad King2018-01-311-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f83330ed ASM: ADSP assembler identification Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1723
| * | | | ASM: ADSP assembler identificationAnton Danielsson2018-01-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to identify the ADSP (Analog Devices) assembler in CMakeDetermineASMCompiler. Fixes: #17695
* | | | | Merge topic 'FindCUDA-restore-config-types'Brad King2018-01-311-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f74aaeb FindCUDA: Fix regression in per-config flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1725
| * | | | | FindCUDA: Fix regression in per-config flagsBrad King2018-01-301-0/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit 48f7e2d300 (Unhardcode the CMAKE_CONFIGURATION_TYPES values, 2017-11-27) accidentally left `CUDA_configuration_types` undefined, but this is used in a few places to handle per-config flags. Restore it. Fixes: #17671
* | | | | CMake Nightly Date StampKitware Robot2018-01-311-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'update_foreach_range_doc'Brad King2018-01-301-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7771657c Help: Better explain that foreach(RANGE ) is inclusive. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1716
| * | | | Help: Better explain that foreach(RANGE ) is inclusive.Robert Maynard2018-01-291-4/+4
| | |/ / | |/| |
* | | | Merge topic 'doc-typo-CMAKE_INCLUDE_CURRENT_DIR'Brad King2018-01-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99e473ca Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1708
| * | | | Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR docssilvioprog2018-01-291-1/+1
| | | | |
* | | | | Merge topic 'doc-typo-CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE'Brad King2018-01-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fc57afde Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1709
| * | | | | Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE docssilvioprog2018-01-291-1/+1
| |/ / / /
* | | | | Merge topic 'vcxproj-DebugInformationFormat-newline'Brad King2018-01-301-4/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b07b1aa4 VS: Use newline for empty DebugInformationFormat tags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1704
| * | | | | VS: Use newline for empty DebugInformationFormat tagsRobert Dailey2018-01-261-4/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, code wrote out empty tags for `<DebugInformationFormat>` like so: <DebugInformationFormat></DebugInformationFormat> This gets corrected by Visual Studio 2017 when saving the solution. The correction appears as: <DebugInformationFormat> </DebugInformationFormat> In the spirit of keeping the XML structure as close to what Visual Studio expects as possible, a newline is inserted after the opening tag in the empty case.
* | | | | Merge topic 'xcode-gen-warning'Brad King2018-01-301-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20ca9d8f cmGlobalXCodeGenerator: Avoid -Wconditional-uninitialized warning Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Sean McBride <sean@rogue-research.com> Merge-request: !1714
| * | | | cmGlobalXCodeGenerator: Avoid -Wconditional-uninitialized warningBrad King2018-01-291-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Clang incorrectly warns about a case where we initialize a variable inside a condition in such a way that it will always be initialized before we use it. Simply initialize the variable when defining it to silence the warning.
* | | | CMake Nightly Date StampKitware Robot2018-01-301-1/+1
|/ / /
* | | Merge topic 'reduce-temporaries'Brad King2018-01-2969-314/+302
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c85bb007 Reduce allocation of temporary values on heap. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1698
| * | | Reduce allocation of temporary values on heap.Pavel Solodovnikov2018-01-2669-314/+302
| | | | | | | | | | | | | | | | | | | | - Use `std::move` while inserting temporary results into vectors. - Change `push_back` to `emplace_back` where appropriate.
* | | | Merge topic 'ctest_start_function_scope'Brad King2018-01-2911-4/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13347740 Help: add release notes, documentation for CTEST_RUN_CURRENT_SCRIPT behavior 74092d92 cmCTestScriptHandler: Add new field ShouldRunCurrentScript Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1703
| * | | | Help: add release notes, documentation for CTEST_RUN_CURRENT_SCRIPT behaviorKyle Edwards2018-01-263-0/+14
| | | | |
| * | | | cmCTestScriptHandler: Add new field ShouldRunCurrentScriptKyle Edwards2018-01-268-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid scope issues with CTEST_RUN_CURRENT_SCRIPT. If ctest_start() is called within a function scope, the value of CTEST_RUN_CURRENT_SCRIPT that it sets doesn't make it to the global scope. With this change, ctest_start() no longer sets CTEST_RUN_CURRENT_SCRIPT, and instead sets a field directly in cmCTestScriptHandler. The old behavior of CTEST_RUN_CURRENT_SCRIPT has also been kept for projects and tests that rely on setting it.
* | | | | Merge topic 'intel-cxx17-flags'Brad King2018-01-292-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3d576f5 Intel: Add C++17 compiler options 4a5727d3 Intel: Correct the C11 ext flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1711
| * | | | | Intel: Add C++17 compiler optionsChristian Pfeiffer2018-01-271-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Intel C++ 18.0, some C++17 features are supported if the flags -std=c++17, respectively /Qstd=c++17 are given. Fixes: #17687
| * | | | | Intel: Correct the C11 ext flagChristian Pfeiffer2018-01-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Intel does not support a 'gnu11' standard flag, only 'c11'.
* | | | | | CMake Nightly Date StampKitware Robot2018-01-291-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2018-01-281-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-01-271-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'test-genex-speedup'Brad King2018-01-2687-312/+165
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d71be346 Tests: Speed up RunCMake.TargetPropertyGeneratorExpressions 234a069d Tests: Speed up RunCMake.GeneratorExpression Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1701
| * | | | Tests: Speed up RunCMake.TargetPropertyGeneratorExpressionsBrad King2018-01-2562-241/+135
| | | | | | | | | | | | | | | | | | | | Consolidate similar test cases.
| * | | | Tests: Speed up RunCMake.GeneratorExpressionBrad King2018-01-2525-71/+30
| | |/ / | |/| | | | | | | | | | Avoid enabling languages in cases that do not need them.
* | | | Merge topic 'dedup-uv-signal-hack'Brad King2018-01-264-74/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ec5f7c1 De-duplicate cmUVSignalHackRAII 1ad58d30 cmUVSignalHackRAII: Use nullptr instead of NULL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1699
| * | | | De-duplicate cmUVSignalHackRAIIBrad King2018-01-254-74/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added separately in `cmCTestMultiProcessHandler` and `cmQtAutoGenerator`. Factor out the duplicate code into a common header for re-use.
| * | | | cmUVSignalHackRAII: Use nullptr instead of NULLBrad King2018-01-251-2/+2
| | |_|/ | |/| |
* | | | Merge topic 'ctest-chrono'Brad King2018-01-2638-212/+272
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6a80ccf Make use of std::chrono throughout every component ff62b005 CTest: add safe conversion from cmDuration to integer types 695951bc CTest: introduce cmDuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1592
| * | | | Make use of std::chrono throughout every componentWouter Klouwen2018-01-2318-62/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit continues the changes made in CTest to support std::chrono by applying it throughout every component where a duration was used. No functional change intended.
| * | | | CTest: add safe conversion from cmDuration to integer typesWouter Klouwen2018-01-237-40/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A problem area by recent refactoring of time to std::chrono has been the unsafe conversion from duration<double> to std::chrono::seconds, which is of an unspecified integer type. This commit adds a template function that for a given type provides a safe conversion, effectively clamping a duration<double> into what fits safely in that type. A specialisation for int and unsigned int are provided. It changes the protential problem areas to use this safe function.
| * | | | CTest: introduce cmDurationWouter Klouwen2018-01-2319-109/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces cmDuration as a typedef for std::chrono::duration<double, std::ratio<1>>. It is less verbose and provides for a point to put future common functionality for durations. No functional change intended.