summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'msvc_cuda_files_use_consistent_obj_names'Brad King2018-01-311-3/+14
|\ | | | | | | | | | | | | 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-301-3/+14
| | | | | | | | | | 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-312-87/+160
|\ \ | | | | | | | | | | | | | | | | | | 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-302-87/+160
| | | | | | | | | | | | Fixes: #17581
* | | 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.
* | | | CMake Nightly Date StampKitware Robot2018-01-311-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-295-3/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | cmCTestScriptHandler: Add new field ShouldRunCurrentScriptKyle Edwards2018-01-265-3/+24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | 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 '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.
* | | CMake Nightly Date StampKitware Robot2018-01-261-1/+1
| |/ |/|
* | Merge topic 'xl-qoptfile'Brad King2018-01-252-4/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | c4dc6485 XL: Enable use of response files for includes and objects e342e410 Makefile,Ninja: Use tool-specific response file flag for include dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1691
| * | Makefile,Ninja: Use tool-specific response file flag for include dirsBrad King2018-01-242-4/+17
| | | | | | | | | | | | | | | | | | | | | When we use a response file for `-I` flags, not all compilers support the `@<file>` syntax. Define `CMAKE_<LANG>_RESPONSE_FILE_FLAG` to specify tool-specific flag, just as we do for linking already via `CMAKE_<LANG>_RESPONSE_FILE_LINK_FLAG`.
* | | Merge topic 'server-polish-opt-handshake'Brad King2018-01-251-14/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 239a3ef8 Server-mode: Document protocol version for optional handshake arguments 9b1a3d24 Server-mode: Rename functions to reflect what they do Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1693
| * | | Server-mode: Rename functions to reflect what they doTobias Hunger2018-01-241-14/+15
| |/ / | | | | | | | | | | | | Rename the test* static functions to getOrTest* to better reflect what they do now.
* | | Merge topic 'RemoveKDevelop3'Brad King2018-01-259-704/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 551bd0b3 Generators: adjust error message for the removed KDevelop3 generator 9198e6a2 Generators: remove KDevelop3 generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1688
| * | | Generators: adjust error message for the removed KDevelop3 generatorAlex Neundorf2018-01-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user request a KDevelop3 project, tell the user that KDevelop3 is not supported anymore, so he sees it's not just a typo. Alex
| * | | Generators: remove KDevelop3 generatorAlex Neundorf2018-01-249-703/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last KDevelop3 release was many years ago, in 2008 I think. I haven't seen or read about anybody using KDevelop 3 since a long time, so I think it can safely be removed from CMake. KDevelop 4 (first released in 2010) has its own proper CMake support now, independent from this generator. Alex
* | | | Merge topic 'update-kwsys'Brad King2018-01-2519-207/+241
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8e89468 Merge branch 'upstream-KWSys' into update-kwsys 7a756570 KWSys 2018-01-23 (0579db1c) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1695
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-01-2419-207/+241
| | |/ / | |/| | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-01-23 (0579db1c)
* | | | Merge topic 'sourceFile-new-properties'Brad King2018-01-2521-184/+536
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 04483111 sourceFile properties: add property INCLUDE_DIRECTORIES 3073bd1f VisualStudio generators: refactoring 78b1c2e0 sourceFile properties: add property COMPILE_OPTIONS 3f935e69 LocalGenerator: refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1596
| * | | | sourceFile properties: add property INCLUDE_DIRECTORIESMarc Chevrier2018-01-2411-16/+206
| | | | |
| * | | | VisualStudio generators: refactoringMarc Chevrier2018-01-237-134/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uniformize include directories handling. Fix memory leaks in class cmVisualStudio10TargetGenerator: OptionsMap uses now std::unique_ptr.
| * | | | sourceFile properties: add property COMPILE_OPTIONSMarc Chevrier2018-01-237-7/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the support of per-source property COMPILE_OPTIONS, including generator expressions support. Related: #17507
| * | | | LocalGenerator: refactoringMarc Chevrier2018-01-238-29/+76
| | | | | | | | | | | | | | | | | | | | | | | | | Introduce method AppendCompileOptions to support future source file property COMPILE_OPTIONS.
* | | | | Merge topic 'fix-include_regular_expression-subdir'Brad King2018-01-251-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d64f9f0 include_regular_expression: Fix propagation to subdirectories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1690
| * | | | | include_regular_expression: Fix propagation to subdirectoriesBrad King2018-01-241-0/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.4.0-rc1~321^2 (cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION, 2015-04-04) accidentally broke propagation of the include regex to subdirectories. Refactoring in commit v3.5.0-rc1~319^2~1 (cmState: Initialize properties immediately, 2015-10-07) moved maintenance of this value from `cmMakefile` to `cmStateSnapshot`. Restore propagation of the `INCLUDE_REGULAR_EXPRESSION` to subdirectories and add a test to cover it. Fixes: #17676
* | | | | Merge topic 'windows-resources-through-link'Brad King2018-01-251-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3b80e86 Windows: Add support for running CMake tools through a symlink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1680
| * | | | | Windows: Add support for running CMake tools through a symlinkPavel P2018-01-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `cmake.exe` is executed through a symlink, `GetModuleFileNameW` will return location of the link instead of the real path of `cmake.exe`. This results in the following error output: CMake Error: Could not find CMAKE_ROOT !!! CMake has most likely not been installed correctly. Use `cmSystemTools::GetRealPath` in `FindCMakeResources` on Windows to resolve any symlink returned by `GetModuleFileNameW`.