summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'issue-18883-support-for-multiple-targets'Brad King2019-03-0626-376/+412
|\ | | | | | | | | | | | | | | | | | | | | 324d18bb34 cmake: Teach --build mode to support multiple targets ebc94500c1 cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommand fdeb364a84 cmGlobalGenerator: Change case of methods from GeneratedMakeCommand struct b3955a08ab cmakemain: Remove ignored --use-stderr option from command line help f1367c8c51 cmGlobalGenerator: Remove unused code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2939
| * cmake: Teach --build mode to support multiple targetsBartosz Kosiorek2019-03-0526-322/+383
| | | | | | | | Fixes: #16136
| * cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommandBartosz Kosiorek2019-03-041-14/+1
| |
| * cmGlobalGenerator: Change case of methods from GeneratedMakeCommand structBartosz Kosiorek2019-03-048-58/+58
| |
| * cmakemain: Remove ignored --use-stderr option from command line helpBartosz Kosiorek2019-03-041-1/+0
| |
| * cmGlobalGenerator: Remove unused codeBartosz Kosiorek2019-03-041-11/+0
| |
* | CMake Nightly Date StampKitware Robot2019-03-061-1/+1
| |
* | Merge topic 'restore_broken_curses_gui'Brad King2019-03-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | aa68ce6bd4 ccmake: fix curses dialog broken by refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Artur Ryt <artur.ryt@gmail.com> Merge-request: !3055
| * | ccmake: fix curses dialog broken by refactoringFelix Schwitzer2019-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | During refactoring in commit f6291eee25 (cmCursesMainForm: Modernize with STL and ranged-for loops, 2019-02-10) a transformation of a loop went wrong and editing the cmake cache with ccmake no longer works. Make ccmake work again. Fixes: #19008
* | | Merge topic 'fix_autorcc_for_qt6'Brad King2019-03-052-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3049
| * | | Autogen: Fallback on internal qrc parser when RCC isn't built yetAlexandru Croitor2019-03-042-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a Qt project, the AUTORCC functionality, by default, uses the rcc binary to get the contents of a qrc file for dependency information. This is done at CMake "generate" time. The problem is that while configuring Qt itself, the rcc binary is not built yet. In that case, to get the contents of the qrc file, fall back to the code branch which uses an ifstream instead of the rcc binary.
* | | | CMake Nightly Date StampKitware Robot2019-03-051-1/+1
| | | |
* | | | Merge topic 'llvm-rc'Brad King2019-03-043-16/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS 1a281a1acd RC: Pass output file in a way that llvm-rc 7 and below understand fa339ced67 CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3007
| * | | | RC: Pass output file in a way that llvm-rc 7 and below understandZsolt Parragi2019-02-272-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to LLVM 8.0, `llvm-rc` does not recognize `/fo` without a space after it. Add the space unconditionally because MS `rc` accepts it too. Issue: #18957
| * | | | CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rcZsolt Parragi2019-02-271-14/+5
| | | | | | | | | | | | | | | | | | | | `llvm-rc` does not support them as of version 8.
* | | | | Merge topic 'vs-fortran-rc'Brad King2019-03-041-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 0b82f56ac6 VS: Fix Fortran target type selection with RC sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3050
| * | | | VS: Fix Fortran target type selection with RC sourcesBrad King2019-03-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel Fortran `.vfproj` files do support both Fortran and the Windows Resource compiler (`.rc)` files. Prior to CMake 3.9 we did not support that, but commit 2c9f35789d (VS: Decide project type by linker lang as fallback, 2017-03-30, v3.9.0-rc1~340^2) accidentally enabled it. It was then broken by commit d3d2c3cd49 (VS: Fix Fortran target type selection when linking C++ targets, 2019-02-04, v3.14.0-rc1~13^2). Restore support for Fortran+RC in VS projects and add a test case. Fixes: #19002
| * | | | CMake 3.14.0-rc3v3.14.0-rc3Brad King2019-03-011-1/+1
| | | | |
| * | | | Merge branch 'cuda_device_link_handle_frameworks' into release-3.14Brad King2019-03-011-0/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3039
| * \ \ \ \ Merge branch 'vs2019' into release-3.14Brad King2019-02-281-8/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3044
| * \ \ \ \ \ Merge branch 'backport-check-std-size-cbegin-cend' into release-3.14Brad King2019-02-272-2/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3030
| | * | | | | | Extend C++17/C++14 feature checks to cover more standard library APIsMathieu Garaud2019-02-272-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure `std::cbegin`, `std::cend`, and `std::size` work in C++17 or C++14 mode before choosing the corresponding standard level for compiling CMake itself. This helps in cases that the compiler is using a standard library too old to support the full standard level chosen.
| * | | | | | | Merge branch 'cmake_role-vs-fix' into release-3.14Brad King2019-02-271-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3028
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-03-041-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2019-03-031-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2019-03-021-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'cuda_device_link_handle_frameworks'Brad King2019-03-011-0/+12
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5d1b15654 CUDA: Filter out -framework arguments during device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3039
| * | | | | | CUDA: Filter out -framework arguments during device linkingRobert Maynard2019-02-281-0/+12
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The filter in commit e768d96c74 (CUDA: Filter out host link flags during device linking, 2018-10-22, v3.13.0-rc2~4^2~2^2) removes `-framework` but not the framework name that comes after it. Revise the logic to remove both. Fixes: #18911
* | | | | | Merge topic 'vs2019'Brad King2019-03-011-8/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9a7f3135e Help: Update VS 2019 generator release note for preview 4 00c1120837 VS: Drop workaround needed only for VS 2019 preview 2 and 3 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Egor Pugin <egor.pugin@gmail.com> Merge-request: !3044
| * | | | | VS: Drop workaround needed only for VS 2019 preview 2 and 3Brad King2019-02-281-8/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A temporary workaround added by commit 626c51f47b (VS: Update for Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) is no longer needed as of VS 2019 preview 4. Fixes: #18898
* | | | | CMake Nightly Date StampKitware Robot2019-03-011-1/+1
| | | | |
* | | | | Merge topic 'refactor-handle-path-command'Brad King2019-02-281-24/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9636b03cca cmFileCommand: Refactor HandleCMakePathCommand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2960
| * | | | | cmFileCommand: Refactor HandleCMakePathCommandArtur Ryt2019-02-261-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make use of cmJoin and fresh cmRange::transform to reduce function complexity. Move conversion logic to named functions.
* | | | | | Merge topic 'optimize_ge_node_lookup'Brad King2019-02-281-68/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a490ea4a28 cmGeneratorExpressionNode: Initialize node key map in class constructor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3031
| * | | | | | cmGeneratorExpressionNode: Initialize node key map in class constructorSebastian Holtermann2019-02-271-68/+69
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | By initializing the node map in the class constructor of the static instance we avoid an if-empty check.
* | | | | | Merge topic 'features-from-default-standard'Brad King2019-02-281-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7213ca870 Features: Do not use a lower-than-default standard for requested features Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3023
| * | | | | | Features: Do not use a lower-than-default standard for requested featuresZsolt Parragi2019-02-261-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `AddRequiredTargetC(xx)` feature didn't take the default compiler standard into account, which possibly resulted in the use of an older standard when some features requested it. Fixes: #18686
* | | | | | | Merge topic 'check-std-size-cbegin-cend'Brad King2019-02-282-2/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6195989c7 Merge branch 'backport-check-std-size-cbegin-cend' a605bf438e Extend C++17/C++14 feature checks to cover more standard library APIs e17deb7ad4 Extend C++17/C++14 feature checks to cover more standard library APIs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3030
| * | | | | | | Extend C++17/C++14 feature checks to cover more standard library APIsMathieu Garaud2019-02-272-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure `std::cbegin`, `std::cend`, and `std::size` work in C++17 or C++14 mode before choosing the corresponding standard level for compiling CMake itself. This helps in cases that the compiler is using a standard library too old to support the full standard level chosen.
* | | | | | | | CMake Nightly Date StampKitware Robot2019-02-281-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'ninja-dyndep-lang-aware'Brad King2019-02-274-94/+181
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f22c18b1c1 ninja: name dyndep internal files using the object file 7c78adca8e cmNinjaTargetGenerator: remove "preprocessed" mentions in dyndep 933dd91642 ninja: do not assume explicit preprocessing uses that output 2c0a7bc770 ninja: pass language to cmake_ninja_depends 72f9bb2993 ninja: make dyndep generation language aware 2dd0cb7aeb Help: note that Ninja also uses OBJECT_OUTPUTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2997
| * | | | | | | | ninja: name dyndep internal files using the object fileBen Boeckel2019-02-252-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that preprocessing outputs are not necessarily used all the way through, the output name is a better base name to use for these files.
| * | | | | | | | cmNinjaTargetGenerator: remove "preprocessed" mentions in dyndepBen Boeckel2019-02-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all languages compile the preprocessed source (or even have preprocessed sources at all).
| * | | | | | | | ninja: do not assume explicit preprocessing uses that outputBen Boeckel2019-02-252-26/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Fortran, this is OK, but for C++, compiling preprocessed source generally results in poorer diagnostic messages and can also be ill-formed anyways.
| * | | | | | | | ninja: pass language to cmake_ninja_dependsBen Boeckel2019-02-252-40/+85
| | | | | | | | |
| * | | | | | | | ninja: make dyndep generation language awareBen Boeckel2019-02-254-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A target may have multiple languages with dyndep rules, separate `.dd` files should be generated.
* | | | | | | | | Merge topic 'autogen_variable_names'Brad King2019-02-274-38/+38
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63191b169e Autogen: Use more readable variable names for static const AUTO* strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3026
| * | | | | | | | | Autogen: Use more readable variable names for static const AUTO* stringsSebastian Holtermann2019-02-264-38/+38
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'ctest-clean-compress'Brad King2019-02-271-2/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5a69c6279 cmcompress: Delete unused 3rdParty module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3019
| * | | | | | | | | cmcompress: Delete unused 3rdParty moduleRegina Pfeifer2019-02-251-2/+1
| | | | | | | | | |