summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'png-optimize'Brad King2019-01-2832-10/+11
|\ | | | | | | | | | | | | | | 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-2531-10/+10
| | | | | | | | | | | | Use FileOptimizer 13.50.2431 (x86) and ZopfliPNG 1.0.2. Update expected file hashes in tests.
| * CPack: Replace corrupted background png with originalLucy Phipps2019-01-252-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The `Modules/CPack.background.png.in` file was originally added by commit f2c0dbd164 (ENH: More work on the packaging. Add Applicaitons, add icons, etc, 2007-02-13, v2.6.0~2217). Then it was removed accidentally by commit 5308afa3f7 (ENH: remove unused file, 2009-03-03, v2.8.0~963) and restored by commit f9dd6a38c5 (ENH: add file back bug use cmake image, 2009-03-04, v2.8.0~958) but with corruption. Restore the original image file and add a Git attribute to prevent newline conversion as we do for other `.png` files.
* | Merge branch 'release-3.13'Brad King2019-01-280-0/+0
|\ \
| * \ Merge branch 'intel-compile-features' into release-3.13Brad King2019-01-251-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !2862
* | \ \ Merge topic 'intel-compile-features'Brad King2019-01-281-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | fc40bca590 Intel: Record support for relaxed constexpr by version 18.0.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2862
| * | | Intel: Record support for relaxed constexpr by version 18.0.5Brad King2019-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Update the special case added by commit f719a13c28 (Features: Add special case to disable relaxed constexpr for Intel 18, 2018-06-04, v3.12.0-rc1~11^2) to record that 18.0.5 fixed the regression.
* | | | Merge topic 'FindPythonInterp-version-fix'Brad King2019-01-281-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08dee696b5 FindPythonInterp: Do not assume any version if test script fails Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2835
| * | | | FindPythonInterp: Do not assume any version if test script failsMarc Chevrier2019-01-221-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Python version is retrieved by executing a small python script. If, for any reason, script fails to execute, leave the `PYTHON_VERSION_*` variables undefined instead of assuming version 1.4. Fixes: #18799
* | | | | 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-25103-5/+776
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23103-5/+776
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2514-29/+92
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2114-29/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'FindICU-win64'Brad King2019-01-251-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26b7a8e77e FindICU: Find 64-bit Windows builds under CMP0074 NEW behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2859
| * | | | | | | FindICU: Find 64-bit Windows builds under CMP0074 NEW behaviorJohannes Reiff2019-01-241-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMP0074 causes FindICU.cmake to always prefer the 32-bit version of ICU programs/libraries on Windows. NO_PACKAGE_ROOT_PATH reverts this behavior. Fixes: #18742
* | | | | | | | 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)
| | * | | | | | | | KWSys 2019-01-24 (b9dd1636)KWSys Upstream2019-01-244-5/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit b9dd1636e50ea43cd33bed8c6ffbbe7161618b54 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 28db6989 cmake: add an option for building with PIC Taylor Braun-Jones (1): 3f35954d SystemTools: Add TextFilesDiffer method Tobias Kloss (1): aa1f7f7c SystemTools: Fix FileIsSymlink with Windows data deduplication
* | | | | | | | | | 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 branch 'release-3.13'Brad King2019-01-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'revert-file-alt-httpauth' into release-3.13Brad King2019-01-241-8/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2858
* | \ \ \ \ \ \ \ \ \ \ \ \ 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
* | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | Merge topic 'FindPython-numpy'Marc Chevrier2019-01-2510-70/+268
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 513e77550d FindPython: Introduce NumPy component Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2734
| * | | | | | | | | | | | | | FindPython: Introduce NumPy componentHiroshi Miura2019-01-2410-70/+268
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18678 Signed-off-by: Hiroshi Miura <miurahr@linux.com>
* | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2019-01-251-1/+1
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'fortran-docs'Brad King2019-01-242-4/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d63d3ce2f Help: Add examples to CheckFortranSource{Runs,Compiles} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2843
| * | | | | | | | | | | | Help: Add examples to CheckFortranSource{Runs,Compiles}Michael Hirsch, Ph.D2019-01-232-4/+28
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge topic 'findgit-note'Marc Chevrier2019-01-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2d7ed1cda Help: Add note about CMAKE_ROLE to FindGit documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2847
| * | | | | | | | | | | | Help: Add note about CMAKE_ROLE to FindGit documentationKyle Edwards2019-01-231-1/+2
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge topic 'findpython-script'Marc Chevrier2019-01-249-113/+166
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4541b0e3d FindPython: Support script mode 8ef1916c82 FindPython: Test existence of imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2844
| * | | | | | | | | | | FindPython: Support script modeKyle Edwards2019-01-239-113/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18827
| * | | | | | | | | | | FindPython: Test existence of imported targetsKyle Edwards2019-01-233-0/+24
| |/ / / / / / / / / /