summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* VS: Add support for explicit 32-bit toolset selection via host=x86Brad King2019-01-281-2/+2
| | | | | Generalize the ``host=x64`` option in `CMAKE_GENERATOR_TOOLSET` to also support ``host=x86``.
* VS: Remove stray semicolons from VS 2019 implementationBrad King2019-01-281-3/+3
|
* VS: Use internal abstraction for VCTargetsPath host archBrad King2019-01-281-3/+2
| | | | | Call our internal host architecture lookup method rather than directly accessing a member used by its implementation.
* Merge topic 'cmake-gui-s-b'Brad King2019-01-281-12/+43
|\ | | | | | | | | | | | | | | ad0853b3d4 QtDialog: Clean up and document -S and -B options Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !2863
| * QtDialog: Clean up and document -S and -B optionsKyle Edwards2019-01-251-12/+43
| |
* | Merge topic 'cmake-E-compare_files-eol'Brad King2019-01-281-5/+16
|\ \ | | | | | | | | | | | | | | | | | | a5098cad94 cmake: Add --ignore-eol option to `-E compare_files` command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2778
| * | cmake: Add --ignore-eol option to `-E compare_files` commandTaylor Braun-Jones2019-01-281-5/+16
| |/ | | | | | | Fixes: #13007
* | Merge topic 'get_filename_component_last_ext'Brad King2019-01-281-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a9220c34d Help: Add notes for topic 'get_filename_component_last_ext' edda30d0f5 Tests: Add tests for LAST_EXT and NAME_WLE 7a25ef326b Help: Add documentation for new get_filename_component components e50a36df48 cmGetFilenameComponentCommand: Add more components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2853
| * | cmGetFilenameComponentCommand: Add more componentsTushar Maheshwari2019-01-241-0/+4
| | | | | | | | | | | | | | | LAST_EXT: gets last extension from filename with multiple periods NAME_WLE: gets the name without the last extension
* | | Merge topic 'vs2019'Brad King2019-01-283-9/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 626c51f47b VS: Update for Visual Studio 2019 Preview 2 fd45cbf40e VS: Fix `/MANIFESTUAC:` link flag mapping for v142 db35e3cfd6 VS: Fix support for '/guard:cf' linker flag for v142 533f95c847 VS: Map the link `/debug` flag for v142 d2fcc6748a VS: Fix `/MANIFESTUAC:NO` link flag mapping for v142 a7973ccb53 VS: Populate `/permissive` flag table entry for v142 049410c0b6 VS: Populate `/JMC-` flag table entry for v142 43aa632f57 VS: Populate `-Qspectre-` flag table entry for v142 ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2856
| * | | VS: Update for Visual Studio 2019 Preview 2Brad King2019-01-243-9/+26
| |/ / | | | | | | | | | | | | | | | The toolset is now called `v142`. Use matching flag tables. Fixes: #18834
* | | Merge topic 'png-optimize'Brad King2019-01-285-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9e6d04558 Reduce size of PNG images 880e380599 CPack: Replace corrupted background png with original Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2852
| * | | Reduce size of PNG imagesLucy Phipps2019-01-255-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Use FileOptimizer 13.50.2431 (x86) and ZopfliPNG 1.0.2. Update expected file hashes in tests.
* | | | CMake Nightly Date StampKitware Robot2019-01-281-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2019-01-271-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2019-01-261-1/+1
| |_|/ |/| |
* | | Merge topic 'max-recursion-depth'Brad King2019-01-259-5/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6982cff0d cmMakefile: Impose maximum recursion limit Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Juraj Oršulić <juraj.orsulic@fer.hr> Merge-request: !2746
| * | | cmMakefile: Impose maximum recursion limitKyle Edwards2019-01-239-5/+78
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | In order to keep infinitely-recursive scripts from causing a stack overflow in the CMake executable, CMake now imposes a maximum recursion limit before issuing an error message. The limit can be adjusted at runtime with CMAKE_MAXIMUM_RECURSION_DEPTH. Fixes: #18694
* | | Merge topic 'exclude_from_all'Brad King2019-01-258-29/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dc6888573d Pass EXCLUDE_FROM_ALL from directory to targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2816
| * | | Pass EXCLUDE_FROM_ALL from directory to targetsZack Galbreath2019-01-218-29/+15
| | | | | | | | | | | | | | | | | | | | | | | | When a target is created it now inherits the EXCLUDE_FROM_ALL property from its directory. This change makes it possible to include a target in "all", even if its directory has been marked as EXCLUDE_FROM_ALL.
* | | | Merge topic 'swift'Brad King2019-01-251-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de13c55d74 Ninja: support `SWIFT_MODULE_NAME` property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2850
| * | | | Ninja: support `SWIFT_MODULE_NAME` propertySaleem Abdulrasool2019-01-241-1/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add a new `SWIFT_MODULE_NAME` property that defaults to the target name. This can be adjusted via `set_target_properties`. This is needed as otherwise, the first source file determines the module name. Issue: #18800
* | | | Merge topic 'clang-warnings'Brad King2019-01-252-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3203bf316 Silence -Wcomma warning 68eabb3576 Avoid -Wstring-plus-int warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2846
| * | | | Silence -Wcomma warningBrad King2019-01-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use a comma-in-paren expression to evaluate multiple statements in a condition. Clang warns that this may be incorrect. Follow its suggestion to cast all but the last expression to `void` to silence the warning.
| * | | | Avoid -Wstring-plus-int warningBrad King2019-01-231-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | In `cmState::GetGlobalProperty` we use a macro to produce a string of the form ";a;b;c" and want to return "a;b;c" by skipping the leading ";". Switch from pointer arithmetic to indexing+addressing to silence the "warning: adding 'int' to a string does not append to the string" diagnostic from Clang.
* | | | Merge topic 'update-kwsys'Brad King2019-01-254-5/+114
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d67ce0a61e Merge branch 'upstream-KWSys' into update-kwsys bee32e96b3 KWSys 2019-01-24 (b9dd1636) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2851
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-01-244-5/+114
| | |/ / | |/| | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-01-24 (b9dd1636)
* | | | Merge topic 'cmake-files-directory'Brad King2019-01-2528-85/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e867ed400 cmake: inlined files dir constant and removed it from cmake.h Acked-by: Kitware Robot <kwrobot@kitware.com> Rejected-by: vvs31415 <vstakhovsky@fastmail.com> Merge-request: !2655
| * | | | cmake: inlined files dir constant and removed it from cmake.hBruno Manganelli2019-01-2128-85/+62
| | | | |
* | | | | Merge topic 'renamefile-string'Brad King2019-01-259-22/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e5c13738b cmSystemTools::RenameFile: Accepts std::string args Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2842
| * | | | | cmSystemTools::RenameFile: Accepts std::string argsVitaly Stakhovsky2019-01-239-22/+25
| | | | | |
* | | | | | Merge topic 'error-overloads'Brad King2019-01-2523-54/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99337d345b cmSystemTools::Error(): new overload accepting std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2845
| * | | | | | cmSystemTools::Error(): new overload accepting std::stringVitaly Stakhovsky2019-01-2323-54/+62
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'unixmfg3-string'Brad King2019-01-256-63/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 614876c638 cmLocalUnixMakefileGenerator3: more methods accept std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2840
| * | | | | | cmLocalUnixMakefileGenerator3: more methods accept std::stringVitaly Stakhovsky2019-01-226-63/+45
| | | | | | |
* | | | | | | Merge topic 'revert-file-alt-httpauth'Brad King2019-01-251-8/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 646eedcfcb Revert "file: Allow DOWNLOAD/UPLOAD using alternate authentication methods" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2858
| * | | | | | | Revert "file: Allow DOWNLOAD/UPLOAD using alternate authentication methods"Brad King2019-01-241-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 31301b46a7 (file: Allow DOWNLOAD/UPLOAD using alternate authentication methods, 2018-08-28, v3.13.0-rc1~155^2). It regressed support for password-protected redirects. Fixes: #18691
| * | | | | | | CMake 3.13.3v3.13.3Brad King2019-01-141-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'cmake-option-parsing' into release-3.13Brad King2019-01-143-16/+22
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2799
| * | | | | | | | Autogen: Issue a warning when AUTOMOC/UIC/RCC gets disabled.Sebastian Holtermann2019-01-101-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to silently disable AUTOMOC/UIC/RCC when no valid Qt version was found. This patch introduces the generation of a warning message in that case. Closes #18732.
* | | | | | | | | Merge topic 'aarch64-no-std-move-function'Brad King2019-01-251-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f56f22b84 cmListCommand: Avoid std::function move constructor on aarch64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2857
| * | | | | | | | | cmListCommand: Avoid std::function move constructor on aarch64Brad King2019-01-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 5a0784ddea (clang-tidy: Pass by value, 2019-01-21), some of the `RunCMake.{list,PositionIndependentCode}` cases have crashed on an aarch64 build with GCC 6. Avoiding use of the `std::function` move constructor avoids the crash. Use a strict preprocessor condition to use this workaround only where needed.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2019-01-251-1/+1
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-01-241-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'tidy-pass-by-value'Brad King2019-01-2373-256/+265
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a0784ddea clang-tidy: Pass by value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2836
| * | | | | | | clang-tidy: Pass by valueRegina Pfeifer2019-01-2273-256/+265
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'update-kwsys'Brad King2019-01-231-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 405d9cb4b5 Merge branch 'upstream-KWSys' into update-kwsys 3068a0d0dc KWSys 2019-01-22 (4fecfe6f) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2833
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-01-221-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-01-22 (4fecfe6f)
* | | | | | | Merge topic 'getmodulesfile-string'Brad King2019-01-236-25/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2993fc347a cmMakefile: GetModulesFile() accepts std::string param Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2838
| * | | | | | | cmMakefile: GetModulesFile() accepts std::string paramVitaly Stakhovsky2019-01-216-25/+20
| | | | | | | |