summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
Commit message (Collapse)AuthorAgeFilesLines
* ReadListFile: Accept std::string argumentVitaly Stakhovsky2019-01-311-8/+8
|
* Merge topic 'functional-callbacks'Brad King2019-01-301-7/+3
|\ | | | | | | | | | | | | | | | | | | 8c92db829b MessageCallback: Remove unused bool& argument bcee24aecc Use `std::function` for callbacks Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: vvs31415 <vstakhovsky@fastmail.com> Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de> Merge-request: !2872
| * Use `std::function` for callbacksRegina Pfeifer2019-01-291-7/+3
| |
* | cmSystemTools: copy file member functions accept std::string paramsVitaly Stakhovsky2019-01-291-1/+1
|/ | | | | Cleaned up `c_str()`s. `cmSystemTools::CopyFileIfDifferent()` removed as redundant.
* Merge topic 'add_consistent_verbose_build_flag'Brad King2019-01-291-4/+5
|\ | | | | | | | | | | | | | | | | | | | | | | 66801f4d40 cmake: Add tests for verbose output to --build mode 439fe2e253 cmake: Add options for verbose output to --build mode 638667efa2 cmake: cmcmd.cxx fix "The arguments are" comments 3ca4402966 ctest: Fix --build-and-test without --build-target on Xcode cb6c233ecc cmake: Add -hideShellScriptEnvironment xcodebuild option 1a45266cb5 cmGlobalGenerator: Add a class that represent the build command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2708
| * cmake: Add options for verbose output to --build modeFlorian Maushart2019-01-281-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | While we already support `VERBOSE` environment variable and `CMAKE_VERBOSE_MAKEFILE` cached variable, add `-v` and `--verbose` command line options to be able to activate verbose output directly from CMake's build tool mode command line. Also make `msbuild` honor the verbosity setting. `xcodebuild` still doesn't honor the verbosity setting as it will need a policy added and reworking of cmGlobalGenerator and cmsys to support multiple command invocation.
* | Merge topic 'message-stdstring'Brad King2019-01-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 186d9b083d cmSystemTools::Message: Add overload accepting std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2869
| * | cmSystemTools::Message: Add overload accepting std::stringVitaly Stakhovsky2019-01-281-1/+1
| | |
* | | cmFileTimeComparison: use std::string argumentsVitaly Stakhovsky2019-01-281-8/+5
|/ /
* | Merge topic 'cmake-files-directory'Brad King2019-01-251-4/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | 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-211-4/+3
| | |
* | | Merge topic 'renamefile-string'Brad King2019-01-251-13/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-231-13/+14
| | | |
* | | | cmSystemTools::Error(): new overload accepting std::stringVitaly Stakhovsky2019-01-231-6/+6
| |_|/ |/| |
* | | cmake: Convert no source/build dir error to warningCraig Scott2019-01-221-2/+5
|/ / | | | | | | | | | | | | | | | | | | Temporarily restore previous behavior that allowed specifying no source or build directory to work, even though it was neither documented nor supported. This commit is expected to eventually be reverted to restore the fatal error for such cases. Relates: #18817
* | Merge topic 'help-mark-default-generator'Brad King2019-01-221-7/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | dfd5ae7da7 Help: Mark default CMake generator with asterisk 6023fe7ff2 ccmake: Append rather than replace Generators section of docs 7408cd3929 cmake: Return generator docs directly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2682
| * | Help: Mark default CMake generator with asteriskArtur Ryt2019-01-181-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | Required extracting default generator evaluation to explicit function, as Visual Studio generators get validated during their construction. Fixes: #18544
| * | cmake: Return generator docs directlyArtur Ryt2019-01-181-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | The GetGeneratorDocumentation() function was not accurately named and required the vector to populate to be passed as a function argument. This commit makes the slightly renamed function return by value, making it a true getter as implied by its name. Some minor refactoring of the implementation also makes the steps of populating the vector clearer.
* | | Merge topic 'stdout-string'Brad King2019-01-221-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3132ea801c cmSystemTools: Stdout(),Stderr() accept std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2829
| * | | cmSystemTools: Stdout(),Stderr() accept std::string argumentVitaly Stakhovsky2019-01-201-8/+8
| |/ /
* | | Merge topic 'cmake-gui-generator-platform'Brad King2019-01-221-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67bced8a26 cmake-gui: Improve label for default platform 48ec0bc140 cmake-gui: Add field for generator platform selection 8bba458ea5 Add global generator factory method to get default platform name 818df52c48 Add global generator factory method to get list of known platforms 8144b00e32 Split global generator factory list with and without platforms b70c0aed5c VS: Factor out helper function to compute host platform name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2832
| * | | Add global generator factory method to get default platform nameBrad King2019-01-181-0/+1
| | | |
| * | | Add global generator factory method to get list of known platformsBrad King2019-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `cmGlobalGeneratorFactory::GetKnownPlatforms` method to return a list of known possible values for `CMAKE_GENERATOR_PLATFORM`. Implement the method for each generator by referencing the list of possible values documented in `Help/generator/*.rst` for it. Co-Author: Julien Jomier <julien.jomier@kitware.com>
| * | | Split global generator factory list with and without platformsBrad King2019-01-181-4/+10
| |/ / | | | | | | | | | | | | | | | Replace `cmGlobalGeneratorFactory::GetGenerators` with a pair of methods to split the list of generator names into those that have platforms in the name and those that do not.
* | | Merge topic 'read-list-file'Brad King2019-01-211-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 25caf7bafe cmMakefile::ReadListFile() accepts std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2821
| * | | cmMakefile::ReadListFile() accepts std::string argumentVitaly Stakhovsky2019-01-171-2/+2
| |/ / | | | | | | | | | Same for cmMakefile::ReadDependentFile(); some cleanup
* | | clang-tidy: Use emplaceRegina Pfeifer2019-01-171-20/+20
|/ /
* | Properties: Add CMAKE_ROLE global propertyKyle Edwards2019-01-171-2/+4
|/ | | | | This property allows scripts to determine whether they're in project mode, script mode, find-package mode, CTest, or CPack.
* Factor out enum MessageType into dedicated headerBruno Manganelli2019-01-161-2/+2
| | | | Reduce the number of files relying on `cmake.h`.
* Merge topic 'vs2019'Brad King2019-01-151-4/+8
|\ | | | | | | | | | | | | | | | | | | 57e48f16f2 VS: Add Visual Studio 16 2019 generator bdef729646 VS: Parameterize VS 2017 generator to support future versions 68d316e0cf VS: Rename VS 2017 generator sources to be version-independent d8ed309d05 VS: Parameterize cmVSSetupAPIHelper instances with VS version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2789
| * VS: Add Visual Studio 16 2019 generatorBrad King2019-01-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Add this generator *without* support for specifying the target architecture in the generator name. cmake-gui will be taught to provide a field for this, and command-line builds can use -A. Also, teach this generator to select a default target architecture based on the host architecture. Fixes: #18689 Inspired-by: Egor Pugin <egor.pugin@gmail.com>
| * VS: Rename VS 2017 generator sources to be version-independentBrad King2019-01-111-2/+3
| | | | | | | | | | | | Rename `cmGlobalVisualStudio{15 => Versioned}Generator`. Rename `Factory` to `Factory15` since that part still needs to be version-specific.
| * VS: Parameterize cmVSSetupAPIHelper instances with VS versionBrad King2019-01-111-2/+1
| |
* | Merge topic 'cmake-option-parsing'Brad King2019-01-141-9/+16
|\ \ | |/ |/| | | | | | | | | | | 27eb7c5bdb cmake: Ensure source and binary dirs are set a1adbc7243 cmake: Stop processing if -P option lacks file name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2799
| * cmake: Ensure source and binary dirs are setCraig Scott2019-01-131-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | If only the source dir is provided, the binary dir is assumed to be the working directory. If only the binary dir is provided and it doesn't yet have a CMakeCache.txt to provide the source dir, then the source dir is assumed to be the working directory. This logic was not previously being handled correctly when -S and/or -B options were involved. Furthermore, when both were missing, no suitable error message was provided and an empty string was used for the build directory. Fixes: #18707
| * cmake: distinguish '-Cpath' from '-C path' in source dir parsingPaul Seyfert2019-01-101-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | This results in the correct source directory being picked up in calls with cmake sourcedir -C settings and in a more appropriate error message when calling mkdir build ; cd build ; cmake -C settings Also fix `-D` and `-U` in the same way.
* | cmake: Drop unused table entry for selecting default generatorBrad King2019-01-091-1/+0
| | | | | | | | | | | | In `cmake::CreateDefaultGlobalGenerator` the table of registry entries does not need an entry for VS 2017 because that is found via the VS setup helper.
* | Merge topic 'messenger-no-cmstate-v2'Craig Scott2019-01-021-1/+30
|\ \ | | | | | | | | | | | | | | | | | | 8a803d784b cmMessenger: Decouple from cmState Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2653
| * | cmMessenger: Decouple from cmStateBruno Manganelli2019-01-011-1/+30
| | |
* | | fileapi: Add protocol v1 infrastructure with support for shared query filesBrad King2018-12-121-0/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a file-based API that clients may use to get semantic information about the buildsystem that CMake generates. Clients will write query files under a designated location in the build tree, and CMake will write reply files for clients to read. Start with support for shared stateless query files. These allow clients to share requests for major object versions and get all those recognized by CMake. Once any client has written a shared request to a build tree it will persist. Other clients will not need to overwrite the request (since it is stateless) and should not remove it either. For now we add only an undocumented object kind to use for testing the query and reply infrastructure. Object kinds providing real semantic information will be added later. Issue: #18398
* | clang-tidy: fix warnings from version 7Regina Pfeifer2018-11-201-1/+1
| | | | | | | | | | Fix some warnings that are new since clang-tidy version 4, and update `.clang-tidy` to suppress the rest.
* | Using front() and back() instead of calculationsCengizhan Pasaoglu2018-11-061-1/+1
| |
* | Merge topic 'graphviz-fix-alias'Brad King2018-10-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 50c4dec072 graphviz: dereference ALIAS targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2521
| * | graphviz: dereference ALIAS targetsNick Schultz2018-10-261-1/+1
| |/ | | | | | | | | | | | | Previous behavior treats ALIAS targets as external targets. This fix de-aliases these targets to their pointed target. Fixes: #15636
* | cmake: distinguish '-Cpath' from '-C path' in source dir parsingPaul Seyfert2018-10-261-0/+15
|/ | | | | | | | | | | | | This results in the correct source directory being picked up in calls with cmake sourcedir -C settings and in a more appropriate error message when calling mkdir build ; cd build ; cmake -C settings Also fix `-D` and `-U` in the same way.
* cmake: Fix generator platform under --build modeBrad King2018-09-251-0/+8
|
* cmake: Factor json version object construction into helperBrad King2018-09-211-4/+9
|
* Merge topic 'provide_explicit_source_and_build_command_line_options'Brad King2018-09-191-13/+44
|\ | | | | | | | | | | | | | | | | 638f00117a Add release note for the -S and -B options. de962cc00d CMake: Internally uses -S instead of -H to specify source directory a10d63d578 cmake: -S and -B can be used to specify source and build directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2358
| * cmake: -S and -B can be used to specify source and build directoriesRobert Maynard2018-09-151-13/+44
| | | | | | | | | | | | Document the previously internal option of '-B' and provide a matching source directory option with '-S'. Both '-B', and '-S' can be used independently of each other.
* | cmState::GetInitializedCacheValue: Return as const std::string*Vitaly Stakhovsky2018-09-101-26/+28
|/