summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: Drop unused dyndep version checkBrad King2019-07-302-29/+20
| | | | | | Our dyndep support version 1 has been merged to upstream Ninja. We never developed a second dyndep version, so simply drop our checks for different versions.
* Ninja: Use in-class initialization of global generator membersBrad King2019-07-302-16/+8
|
* Merge branch 'release-3.15'Brad King2019-07-300-0/+0
|\
| * Merge branch 'swift-with-interface-libs' into release-3.15Brad King2019-07-292-8/+12
| |\ | | | | | | | | | Merge-request: !3624
* | \ Merge topic 'find_more_binutils'Brad King2019-07-301-16/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 993fe2b4af CMakeFindBinUtils: add some more binutils 5412d63714 CMakeFindBinUtils: add missing llvm alternatives 3a82ef78eb CMakeFindBinUtils: Rename and unset variables for additional names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3584
| * | | CMakeFindBinUtils: add some more binutilsNorbert Lange2019-07-231-1/+7
| | | |
| * | | CMakeFindBinUtils: add missing llvm alternativesNorbert Lange2019-07-231-6/+9
| | | | | | | | | | | | | | | | | | | | LLVM 8.0 already ships with alternatives for all current Binutils. Enable them.
| * | | CMakeFindBinUtils: Rename and unset variables for additional namesNorbert Lange2019-07-231-13/+14
| | | | | | | | | | | | | | | | | | | | use the name pattern `_CMAKE_ADDITIONAL_<PROGRAM_NAME>_NAMES`, and unset those variables at the end of the function
* | | | Merge topic 'swift-with-interface-libs'Brad King2019-07-302-8/+12
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 601fe84bd1 Swift: Restore support for enabling with INTERFACE libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Wanderley Guimarães da Silva <wanderley.guimaraes@gmail.com> Acked-by: Guillaume Egles <gegles@gmail.com> Merge-request: !3624
| * | | Swift: Restore support for enabling with INTERFACE librariesBrad King2019-07-292-8/+12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The check added in commit b06f4c8a74 (Swift: disallow WIN32_EXECUTABLE properties, 2019-05-31, v3.15.0-rc1~9^2) makes sense only for executables because the `WIN32_EXECUTABLE` property is defined only for them. Running the check on other target types, particularly those that do not link such as INTERFACE libraries, violates internal assumptions. In particular, `GetLinkerLanguage` should not be called on such targets. Fixes: #19528
* | | Merge topic 'multipackage_tutorial_compiles'Brad King2019-07-302-6/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 98164b707f Tutorial: MultiPackage now correctly compiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3594
| * | | Tutorial: MultiPackage now correctly compilesRobert Maynard2019-07-252-6/+13
| | | |
* | | | Merge topic 'cmStringAlgorithms'Kyle Edwards2019-07-3078-165/+216
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f71f7ce3f0 cmStringAlgorithms: Move string functions to the new cmStringAlgorithms.h Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3618
| * | | | cmStringAlgorithms: Move string functions to the new cmStringAlgorithms.hSebastian Holtermann2019-07-2978-165/+216
| | | | | | | | | | | | | | | | | | | | | | | | | This adds the `cmStringAlgorithms.h` header and moves all string functions from `cmAlgorithms.h` to `cmStringAlgorithms.h`.
* | | | | Merge topic 'function-blocker-stack'Kyle Edwards2019-07-302-46/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 020478dbea cmMakefile: Keep function blockers in a stack Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3613
| * | | | | cmMakefile: Keep function blockers in a stackRegina Pfeifer2019-07-262-46/+30
| | | | | | | | | | | | | | | | | | | | | | | | Highlight the fact that we only ever operate on the top element.
* | | | | | Merge topic 'cmake-version'Craig Scott2019-07-309-79/+98
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe2c558ba6 CMakeVersion: Preserve Git information during 'git archive' 0505a66cbf CMakeVersion: Add generic '-git' suffix when no git info is available f7bf08754b CMakeVersion: Provide Git information in non-exact release versions ac48259333 CMakeVersion: Re-order logic to obviate addition of each component 311f232f7a CMakeVersion: De-duplicate variable initialization 2f608566b4 CMakeVersion: Factor git execution into helper macro 74ff80323c CMakeVersion: Use FindGit module to find Git e1e7986c00 CMakeVersion: Consider Git even with just a `.git` file ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3622
| * | | | | | CMakeVersion: Preserve Git information during 'git archive'Brad King2019-07-292-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `export-subst` to get information about the Git commit used to produce an archive.
| * | | | | | CMakeVersion: Add generic '-git' suffix when no git info is availableBrad King2019-07-291-0/+6
| | | | | | |
| * | | | | | CMakeVersion: Provide Git information in non-exact release versionsBrad King2019-07-291-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our exact release commits have a subject of the form `CMake <version>`. Distinguish development on a release branch in commits after such a version but before the next release by providing Git information.
| * | | | | | CMakeVersion: Re-order logic to obviate addition of each componentBrad King2019-07-291-16/+19
| | | | | | |
| * | | | | | CMakeVersion: De-duplicate variable initializationBrad King2019-07-291-4/+2
| | | | | | |
| * | | | | | CMakeVersion: Factor git execution into helper macroBrad King2019-07-291-24/+23
| | | | | | |
| * | | | | | CMakeVersion: Use FindGit module to find GitBrad King2019-07-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now require at least CMake 3.1 to build, and that has the FindGit module.
| * | | | | | CMakeVersion: Consider Git even with just a `.git` fileBrad King2019-07-291-1/+1
| | | | | | |
| * | | | | | CMakeVersion: Move git logic to main scriptBrad King2019-07-292-32/+31
| | | | | | |
| * | | | | | CMakeVersion: Move computation logic to main scriptBrad King2019-07-295-33/+30
| | | | | | |
| * | | | | | CMakeVersion.rc: Compute resource components only on WindowsBrad King2019-07-292-15/+15
| | | | | | |
| * | | | | | gitattributes: Do not export any .git paths in git archiveBrad King2019-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have paths for `.gitattributes` itself, `.gitignore`, and `.github`. None should be exported in source archives.
* | | | | | | CMake Nightly Date StampKitware Robot2019-07-301-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'modernize_string_view_cmOutputConverter'Brad King2019-07-294-126/+138
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec892a572b cmOutputConverter: Make shell escaping methods cm::string_view based 8573e20c43 cmOutputConverter: Let GetFortranFormat accept a cm::string_view 4911762358 cmOutputConverter: Return bool instead of int in utility functions a929255dec cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_view 1b30b28c04 cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_view 6675f785be cmOutputConverter: Let EscapeForCMake accept a cm::string_view 09977c1816 cmSystemTool: Let TrimWhitespace accept a cm::string_view 2f19e53705 cmSystemTool: Let HelpFileName accept a cm::string_view ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3615
| * | | | | | cmOutputConverter: Make shell escaping methods cm::string_view basedSebastian Holtermann2019-07-282-63/+62
| | | | | | |
| * | | | | | cmOutputConverter: Let GetFortranFormat accept a cm::string_viewSebastian Holtermann2019-07-282-5/+13
| | | | | | |
| * | | | | | cmOutputConverter: Return bool instead of int in utility functionsSebastian Holtermann2019-07-282-18/+18
| | | | | | |
| * | | | | | cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_viewSebastian Holtermann2019-07-282-4/+3
| | | | | | |
| * | | | | | cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_viewSebastian Holtermann2019-07-281-2/+2
| | | | | | |
| * | | | | | cmOutputConverter: Let EscapeForCMake accept a cm::string_viewSebastian Holtermann2019-07-282-9/+10
| | | | | | |
| * | | | | | cmSystemTool: Let TrimWhitespace accept a cm::string_viewSebastian Holtermann2019-07-282-7/+7
| | | | | | |
| * | | | | | cmSystemTool: Let HelpFileName accept a cm::string_viewSebastian Holtermann2019-07-282-2/+3
| | | | | | |
| * | | | | | cmSystemTool: Let EscapeQuotes accept a cm::string_viewSebastian Holtermann2019-07-282-5/+5
| | | | | | |
| * | | | | | cmSystemTool: Let Expand(ed)ListArgument accept a cm::string_viewSebastian Holtermann2019-07-282-15/+19
| | | | | | |
* | | | | | | Merge topic 'CheckCXXSymbolExists-c++-syntax'Brad King2019-07-293-2/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72fcadb007 CheckCXXSymbolExists: Make C++-syntax symbols work on more compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3545
| * | | | | | | CheckCXXSymbolExists: Make C++-syntax symbols work on more compilersHong Xu2019-07-263-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some compilers the syntax `#ifndef std::fopen` will always lead to compilation error. Avoid generating it in the check.
* | | | | | | | Merge topic 'better_gen_exp_example_tutotrial'Brad King2019-07-295-32/+79
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa203ee323 Tutorial: Improve Step 10 generator expression example. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3571
| * | | | | | | | Tutorial: Improve Step 10 generator expression example.Robert Maynard2019-07-255-32/+79
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use compiler flags and standard levels as the compelling argument for using generator expressions and interface libraries
* | | | | | | | Merge topic 'android-ndk-r19'Brad King2019-07-2921-82/+171
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97bca2f9fa Android: Use unified toolchain in NDK r19+ 19f36c5fb2 Android: Update test to not require GCC compiler to exist in NDK f3e32ddae9 Android: Re-order system initialization to select sysroot last 9a0720b819 Android: Clarify name of internal variable for arch triple 4e6c58d937 Android: Select NDK host tag while determining system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3612
| * | | | | | | | Android: Use unified toolchain in NDK r19+Brad King2019-07-2618-18/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK build system now uses only a single toolchain in <ndk>/toolchains/llvm/prebuilt/<host> Its compilers are always `bin/{clang,clang++}` and its binutils are always `bin/<triple>-*`. It is a standalone toolchain: * The Anrdoid API level is specified at the end of `--target=`. * The standard library may be specified via `-stdlib=`. * No need to pass system includes or libraries explicitly. * No need to pass `--sysroot` or `-gcc-toolchain`. Teach CMake to recognize NDK versions that have a unified toolchain with its own sysroot and use the above approach. Fixes: #18739
| * | | | | | | | Android: Update test to not require GCC compiler to exist in NDKBrad King2019-07-261-18/+19
| | | | | | | | |
| * | | | | | | | Android: Re-order system initialization to select sysroot lastBrad King2019-07-261-2/+2
| | | | | | | | |
| * | | | | | | | Android: Clarify name of internal variable for arch tripleBrad King2019-07-262-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The triple applies to more than just header locations.
generated by cgit v0.12 at 2025-01-26 16:38:35 (GMT)