summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | Merge topic 'update-curl'Brad King2018-01-26101-4125/+8934
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd8e31a1 Merge branch 'upstream-curl' into update-curl af9e6540 curl 2018-01-23 (d6c21c8e) e9c8ea75 curl: Update script to get curl 7.58.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1696
| * \ \ \ \ Merge branch 'upstream-curl' into update-curlBrad King2018-01-24100-4124/+8933
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2018-01-23 (d6c21c8e)
| | * | | | | curl 2018-01-23 (d6c21c8e)Curl Upstream2018-01-24100-4124/+8933
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit d6c21c8eec597a925d2b647cff3d58ac69de01a0 (curl-7_58_0).
| * | | | | | curl: Update script to get curl 7.58.0Brad King2018-01-241-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-01-261-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'doc-dev-release'Brad King2018-01-251-0/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb33bb65 Help/dev: Add log step to 'release' branch instructions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1700
| * | | | | Help/dev: Add log step to 'release' branch instructionsBrad King2018-01-251-0/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Extend the maintainer guide with a reminder to self-review the new ancestry of the `release` and `master` branches to ensure that nothing unexpected was merged.
* | | | | Merge topic 'CPackDeb-help-typo'Brad King2018-01-251-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99ba188c CPackDeb: Fix typo in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1697
| * | | | | CPackDeb: Fix typo in documentationTobias Svehagen2018-01-241-2/+2
| |/ / / /
* | | | | Merge topic 'xl-qoptfile'Brad King2018-01-253-4/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | XL: Enable use of response files for includes and objectsBrad King2018-01-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IBM XL compiler supports response files via `-qoptfile=<file>` instead of `@<file>`.
| * | | | | 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 'fix-cray-pic'Brad King2018-01-255-6/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b886b46c Cray: Add common PIC flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1692
| * | | | | Cray: Add common PIC flagsChuck Atkins2018-01-245-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #17208
* | | | | | Merge topic 'server-polish-opt-handshake'Brad King2018-01-252-18/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Document protocol version for optional handshake argumentsTobias Hunger2018-01-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document which Protocol version only needs the build directory to be passed during a handshake. This is available a bit earlier than that, but from all I can tell 1.2 is the earliest version where that feature is reliably available.
| * | | | | | 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-2517-753/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2417-752/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | | | | | KWSys 2018-01-23 (0579db1c)KWSys Upstream2018-01-2419-207/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 0579db1c97715f9936523dd473c0ed7613b68e68 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 3e807fd6 cmake: specify source file extensions Brad King (1): 38855ca1 Set CMP0042 explicitly with CMake 3.0 and above Chuck Atkins (1): 4ca97fc6 SystemTools: Disable getpwnam for static linux builds Hans Johnson (1): 7d7f3b2d Configure: Add KWSYS_NULLPTR macro for C++ code Sankhesh Jhaveri (1): 20c458d0 Set CMP0022 policy to new to provide link interface definitions Sean McBride (1): c6829e4d Fixed a few comments, mostly regarding base 2 vs base 10 sizes luz.paz (1): 4b67f965 Remove superfluous double whitespace in appropriate places
* | | | | | | | Merge topic 'sourceFile-new-properties'Brad King2018-01-2551-232/+722
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2438-23/+350
| | | | | | | | |
| * | | | | | | | 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-2315-55/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-255-0/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-245-0/+15
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
* | | | | | | | | | Merge topic 'stdstring'Brad King2018-01-257-30/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25243014 cmMakefile: use std::string in more methods; cleanup c_str()s Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1685
| * | | | | | | | | | cmMakefile: use std::string in more methods; cleanup c_str()sVitaly Stakhovsky2018-01-237-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit 969c1f94ae (cmSourceGroup: code improvements; use std::string and C++11 loops, 2017-01-10).