summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'remove-lua-extra-paths'Brad King2018-08-301-9/+0
|\ | | | | | | | | | | | | | | 2bd71f6377 FindLua: Remove manually specified additional paths Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !2321
| * FindLua: Remove manually specified additional pathsChuck Atkins2018-08-281-9/+0
| | | | | | | | | | The additional paths specified are already accounted for in the appropriate Platform files.
* | Merge branch 'release-3.12'Brad King2018-08-300-0/+0
|\ \
| * \ Merge branch 'android-ndk-r18' into release-3.12Brad King2018-08-285-9/+29
| |\ \ | | | | | | | | | | | | Merge-request: !2319
* | \ \ Merge topic 'android-ndk-r18'Brad King2018-08-305-9/+29
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | ca97d4cb5f Android: Add support for NDK r18 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2319
| * | | Android: Add support for NDK r18Brad King2018-08-285-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NDK r18 drops GCC toolchains and some STL types. We need to choose a clang toolchain by default when no gcc toolchains are available. Switch the STL type default to `c++_static` when the old `gnustl_static` default is not available. Update the test suite to not run tests for STL types that do not exist. Also do not expect the gcc toolchain `cpp` tool to be available because r18 does not provide it. Also teach it to tolerate `gcc -dumpmachine` output like `arm--linux-android` that differs from the toolchain prefix. Fixes: #18301
* | | | CMake Nightly Date StampKitware Robot2018-08-301-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-08-291-1/+1
| | | |
* | | | Merge topic 'FindMatlab-missing-install'Brad King2018-08-281-12/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d9640dbc2 FindMatlab: Guard against nonexistent installation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2318
| * | | | FindMatlab: Guard against nonexistent installationChuck Atkins2018-08-271-12/+14
| | |_|/ | |/| |
* | | | Merge topic 'lg-directory'Brad King2018-08-2811-22/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50fbfee3a0 cmLocalGenerator: return directories as const std::string& Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2309
| * | | | cmLocalGenerator: return directories as const std::string&Vitaly Stakhovsky2018-08-2711-22/+21
| | | | |
* | | | | Merge topic 'mk-directory'Brad King2018-08-2821-67/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c8fd23ec6f cmMakefile: return directories as const std::string& Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2311
| * | | | | cmMakefile: return directories as const std::string&Vitaly Stakhovsky2018-08-2721-67/+65
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-08-281-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'cray_cce_cxx14'Brad King2018-08-271-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a655681c3 Cray: Record C++14 compiler mode options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2307
| * | | | | Cray: Record C++14 compiler mode optionsKelly (KT) Thompson2018-08-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18270
* | | | | | Merge topic 'more-misc-typos'Brad King2018-08-274-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aca65a9379 Maint: misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2301
| * | | | | | Maint: misc. typosluz.paz2018-08-244-4/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | Found via `codespell`.
* | | | | | Merge topic 'update-icons'Brad King2018-08-278-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66f59bd7da cmake-gui: Update icons Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2295
| * | | | | | cmake-gui: Update iconsT.J. Corona2018-08-168-0/+0
| | | | | | |
* | | | | | | Merge topic 'static-lib-options'Brad King2018-08-2725-15/+187
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 974de0e199 static library: add property STATIC_LIBRARY_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2290
| * | | | | | | static library: add property STATIC_LIBRARY_OPTIONSMarc Chevrier2018-08-1525-15/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue: #18251
* | | | | | | | Merge topic 'FindZLIB-ProgramFiles'Brad King2018-08-271-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbbc6e2eef FindZLIB: Fix path detection via ProgramFiles env variables Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: RElesgoe <relesgoe@gmail.com> Merge-request: !2287
| * | | | | | | | FindZLIB: Fix path detection via ProgramFiles env variablesAndreas Schneider2018-08-241-3/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic 'doc-include_directories-alternative'Brad King2018-08-271-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e558ada977 Help: Document alternative to include_directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2304
| * | | | | | | | Help: Document alternative to include_directoriesDavid Demelier2018-08-231-0/+6
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many existing tutorials suggest `include_directories` but that does not handle propagation to dependencies and such. Add a link to its documentation suggesting `target_include_directories` instead.
* | | | | | | | Merge topic 'ProjectReference'Brad King2018-08-271-23/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4ba1f5a94 VS: Disallow ReferenceOutputAssembly in ProjectReference if not possible Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2285
| * | | | | | | | VS: Disallow ReferenceOutputAssembly in ProjectReference if not possibleBastien Schatt2018-08-121-23/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly turn off `ReferenceOutputAssembly` in `ProjectReference` elements naming other project files whose types do not produce assemblies. We already do this for `C#` but it makes sense for other languages too. Fixes: #17906
* | | | | | | | | Merge topic 'ninja-generator-do-not-add-alias-matching-custom-command-output'Brad King2018-08-273-0/+54
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 180c2f8de8 Ninja: Fix dupbuild error skipping alias with conflicting custom command Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Isaiah <isaiah.norton@gmail.com> Merge-request: !2276
| * | | | | | | | | Ninja: Fix dupbuild error skipping alias with conflicting custom commandJean-Christophe Fillion-Robin2018-08-093-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See-also: https://issues.slicer.org/view.php?id=4595 Reported-by: Isaiah Norton <inorton@bwh.harvard.edu>
* | | | | | | | | | Merge topic 'xcode-compiler-id-sign-identity'Brad King2018-08-272-0/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c68b358ce3 Xcode: Set CODE_SIGN_IDENTITY during compiler identification Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Gregor Jasny <gjasny@googlemail.com> Merge-request: !2299
| * | | | | | | | | | Xcode: Set CODE_SIGN_IDENTITY during compiler identificationRafal Parzych2018-08-242-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY` is set then propagate it to the compiler id test project too. Fixes: #18292
* | | | | | | | | | | Merge topic 'extra-gen-fix-0'Brad King2018-08-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4e6b63ec9 Extra Generator: Fix extraction of macros with value 0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2308
| * | | | | | | | | | | Extra Generator: Fix extraction of macros with value 0ibisz2018-08-241-3/+3
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic in CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs to handle macros with value `0`.
* | | | | | | | | | | Merge topic 'vs2017-no-default-FC'Brad King2018-08-271-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bd768174a VS: Avoid VS 2017 toolset default use of /FC flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alberto Garcia Illera <agarciaillera@gmail.com> Acked-by: Martin Hořeňovský <martin.horenovsky@gmail.com> Merge-request: !2306
| * | | | | | | | | | | VS: Avoid VS 2017 toolset default use of /FC flagBrad King2018-08-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 toolsets now use this flag by default if `UseFullPaths` is not explicitly set to `false` in the .vcxproj file. Since there is no negative form of this flag there is no way for projects to turn it off through our flag map. Also, the Makefile and Ninja generators do not add this flag unless it is explicitly specified by the project. Teach our generator to set `UseFullPaths` to `false` in VS 2017 unless the project or use has explicitly specified `/FC`. Fixes: #18261
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-08-271-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-08-261-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-08-251-1/+1
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'release-3.12'Brad King2018-08-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'doc-clang-tidy-typo' into release-3.12Brad King2018-08-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2303
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'FindCUDA-deprecate-cublas_device' into release-3.12Brad King2018-08-231-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2298
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cuda-no-cublas_device' into release-3.12Brad King2018-08-233-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2296
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'state-reset-glob' into release-3.12Brad King2018-08-233-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2278
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'doc-clang-tidy-typo'Brad King2018-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85432f4898 Help: Fix typo in clang-tidy example -checks option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2303
| * | | | | | | | | | | | | | Help: Fix typo in clang-tidy example -checks optionDavid Demelier2018-08-241-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge topic 'FindCUDA-deprecate-cublas_device'Brad King2018-08-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bdf1f36135 FindCUDA: Do not find cublas_device on CUDA >= 9.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2298
| * | | | | | | | | | | | | FindCUDA: Do not find cublas_device on CUDA >= 9.2Kenta Kubo2018-08-231-1/+2
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cublas_device` has been deprecated and will be removed in future versions of CUDA. Issue: #18290
* | | | | | | | | | | | | Merge topic 'cuda-no-cublas_device'Brad King2018-08-243-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 122c79748c CUDA: Avoid using deprecated cublas_device to identify device lib dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2296
generated by cgit v0.12 at 2025-09-10 13:30:10 (GMT)