summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'add_consistent_verbose_build_flag'Brad King2019-01-2942-135/+268
|\ | | | | | | | | | | | | | | | | | | | | | | 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 tests for verbose output to --build modeRobert Maynard2019-01-2811-1/+50
| |
| * cmake: Add options for verbose output to --build modeFlorian Maushart2019-01-2810-7/+61
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * cmake: cmcmd.cxx fix "The arguments are" commentsFlorian Maushart2019-01-251-6/+6
| | | | | | | | Changed "argv" to "args" in comments to match parameter names
| * ctest: Fix --build-and-test without --build-target on XcodeFlorian Maushart2019-01-251-5/+7
| |
| * cmake: Add -hideShellScriptEnvironment xcodebuild optionFlorian Maushart2019-01-251-0/+3
| | | | | | | | | | For CMake's build tool mode add -hideShellScriptEnvironment if version is XCode 7.0 or above
| * cmGlobalGenerator: Add a class that represent the build commandRobert Maynard2019-01-2522-118/+143
| | | | | | | | | | | | This refactors a std::vector<std::string> into a class so that we can extend the features to represent things such as multiple chained commands in the future.
* | Merge topic 'cmoutputconverter-simplify'Brad King2019-01-2925-86/+89
|\ \ | | | | | | | | | | | | | | | | | | b6a957c969 cmOutputConverter: move ConvertToRelativePath to cmStateDirectory. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2831
| * | cmOutputConverter: move ConvertToRelativePath to cmStateDirectory.Bruno Manganelli2019-01-2725-86/+89
| | |
* | | Merge topic 'message-stdstring'Brad King2019-01-2918-26/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-2818-26/+30
| | | |
* | | | Merge topic 'ftc-string'Brad King2019-01-297-34/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2fc69ba0b3 cmFileTimeComparison: use std::string arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2868
| * | | | cmFileTimeComparison: use std::string argumentsVitaly Stakhovsky2019-01-287-34/+33
| |/ / /
* | | | Merge topic 'update-tutorial'Brad King2019-01-29120-680/+3346
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e2cdacf7b Tests: Update style of c++ code snippets in Tutorial directions f2ddedfa58 Tests: Update CMake tutorial 438651506a Tests: Make ExternalProjectLocal independent of Tutorial directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2731
| * | | | Tests: Update style of c++ code snippets in Tutorial directionsZack Galbreath2019-01-272-25/+17
| | | | |
| * | | | Tests: Update CMake tutorialBetsy McPhail2019-01-27112-604/+3099
| | | | | | | | | | | | | | | | | | | | Latest material from data.kitware.com -> Collections -> Courses -> CMake.
| * | | | Tests: Make ExternalProjectLocal independent of Tutorial directoryBetsy McPhail2019-01-278-76/+255
| | | | | | | | | | | | | | | | | | | | | | | | | Adopt a copy of the needed content so we can modify the original independent of this test.
* | | | | Merge topic 'vs-host-arch'Brad King2019-01-2920-26/+95
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fd742a6ff VS: Teach VS 2019 generator to select host tools matching host arch 17cef3806d VS: Add support for explicit 32-bit toolset selection via host=x86 bf774e521b VS: Remove stray semicolons from VS 2019 implementation 142e67eac6 VS: Use internal abstraction for VCTargetsPath host arch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2870
| * | | | | VS: Teach VS 2019 generator to select host tools matching host archBrad King2019-01-287-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator is new so we can introduce the long-desired behavior of selecting ``host=x64`` tools by default on x64 hosts.
| * | | | | VS: Add support for explicit 32-bit toolset selection via host=x86Brad King2019-01-2814-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the ``host=x64`` option in `CMAKE_GENERATOR_TOOLSET` to also support ``host=x86``.
| * | | | | VS: Remove stray semicolons from VS 2019 implementationBrad King2019-01-281-3/+3
| | | | | |
| * | | | | VS: Use internal abstraction for VCTargetsPath host archBrad King2019-01-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call our internal host architecture lookup method rather than directly accessing a member used by its implementation.
* | | | | | Merge topic 'add-missing-macos-framework'Brad King2019-01-291-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 475e78d907 macOS: Add missing explicit dependency on CoreServices framework Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2873
| * | | | | | macOS: Add missing explicit dependency on CoreServices frameworkChuck Atkins2019-01-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Apple, the implementation of cmGlobalXCodeGenerator::Open uses LSOpenCFURLRef from CoreServices. This get's transitively pulled in from CMake's libuv build but ends up generating a linker error when using an external libuv. This explicitly adds the appropriate dependency.
* | | | | | | Merge topic 'autogen_reenable_implicit_include_dirs'Brad King2019-01-298-79/+128
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03dbb62d31 Autogen: Reenable passing compiler implicit include directories to moc 5f34bdc7f9 cmLocalGenerator: Refactor `GetIncludeDirectoriesImplicit` method f16dfdf71f cmLocalGenerator: Simplify `GetIncludeDirectories` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2864
| * | | | | | | Autogen: Reenable passing compiler implicit include directories to mocSebastian Holtermann2019-01-284-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07) we now have compiler implicit include directory computation for gcc and clang. It should be safe now to pass these to `moc`. This patch re-enables passing the compiler implicit include directories to `moc`, which was disabled due to issue #18669. Fixes: #18041 Issue: #18669
| * | | | | | | cmLocalGenerator: Refactor `GetIncludeDirectoriesImplicit` methodSebastian Holtermann2019-01-281-45/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a dedicated `std::set` for implicit include directories instead of (ab)using the emitted variable. This in combination with lambdas makes it easier to comprehend which paths are emitted. For the implicit include directories we used to omit the `CMAKE_SYSROOT_COMPILE`/`CMAKE_SYSROOT` prefix. This has been changed and the implicit paths are returned prefixed. Implicit include directory returning is only ever used by QtAutoGen which requires prefixed paths. QtAutoGen passes the (implicit) include paths to the `moc` which isn't aware of `CMAKE_SYSROOT_COMPILE`/`CMAKE_SYSROOT`.
| * | | | | | | cmLocalGenerator: Simplify `GetIncludeDirectories`Sebastian Holtermann2019-01-285-26/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch strips the `stripImplicitDirs` and `appendAllImplicitDirs` parameters from the `cmLocalGenerator::GetIncludeDirectories` method and makes it a wrapper into the new `cmLocalGenerator::GetIncludeDirectoriesImplicit` method. `cmLocalGenerator::GetIncludeDirectoriesImplicit` is the renamed old implementation of `cmLocalGenerator::GetIncludeDirectories` and still accepts `stripImplicitDirs` and `appendAllImplicitDirs`. The motivation is that there's only *one* case where `cmLocalGenerator::GetIncludeDirectories` is called with the `stripImplicitDirs` parameter being `false` (QtAutoGen), but many other places where it is called using the `true` default value. QtAutoGen is modified to use `cmLocalGenerator::GetIncludeDirectoriesImplicit` directly. In two use cases of `cmLocalGenerator::GetIncludeDirectories` the manually set `true` value for `stripImplicitDirs` is removed.
* | | | | | | | CMake Nightly Date StampKitware Robot2019-01-291-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'commit-ref-in-prose'Brad King2019-01-281-5/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 939dc9a58c Help: prefer commit hashes in commit references Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2854
| * | | | | | Help: prefer commit hashes in commit referencesBen Boeckel2019-01-251-5/+14
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic is that the describe output is readily available using `git tag --contains` locally. In addition, for a hypothetical commit which landed in both v3.9.4 and v3.10.1, there is no "better" tag to refer to. since v3.10.0's relation to such a commit is unclear either way. Also mention that a `Fixes` trailer is preferred if the mention is just to indicate a commit which introduced an error rather than writing a complete sentence about it.
* | | | | | Merge topic 'cmake-gui-s-b'Brad King2019-01-283-12/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad0853b3d4 QtDialog: Clean up and document -S and -B options Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !2863
| * | | | | | QtDialog: Clean up and document -S and -B optionsKyle Edwards2019-01-253-12/+57
| | | | | | |
* | | | | | | Merge branch 'release-3.13'Brad King2019-01-280-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'doxygen-escaping' into release-3.13Brad King2019-01-281-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2867
* | \ \ \ \ \ \ \ Merge topic 'doxygen-escaping'Brad King2019-01-281-1/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e81fd5d5ba FindDoxygen: Escape backslashes in default values Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Julien Schueller <schueller@phimeca.com> Merge-request: !2867
| * | | | | | | | FindDoxygen: Escape backslashes in default valuesCraig Scott2019-01-261-1/+3
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doxygen 1.8.15 added a new LATEX_MAKEINDEX_CMD config item and it has a default value that contains a backslash on some installations. Fixes: #18738
* | | | | | | | Merge topic 'cmake-E-compare_files-eol'Brad King2019-01-2813-7/+37
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5098cad94 cmake: Add --ignore-eol option to `-E compare_files` command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2778
| * | | | | | | cmake: Add --ignore-eol option to `-E compare_files` commandTaylor Braun-Jones2019-01-2813-7/+37
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #13007
* | | | | | | Merge topic 'get_filename_component_last_ext'Brad King2019-01-284-1/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a9220c34d Help: Add notes for topic 'get_filename_component_last_ext' edda30d0f5 Tests: Add tests for LAST_EXT and NAME_WLE 7a25ef326b Help: Add documentation for new get_filename_component components e50a36df48 cmGetFilenameComponentCommand: Add more components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2853
| * | | | | | | Help: Add notes for topic 'get_filename_component_last_ext'Brad King2019-01-281-0/+6
| | | | | | | |
| * | | | | | | Tests: Add tests for LAST_EXT and NAME_WLETushar Maheshwari2019-01-241-1/+3
| | | | | | | |
| * | | | | | | Help: Add documentation for new get_filename_component componentsTushar Maheshwari2019-01-241-0/+2
| | | | | | | |
| * | | | | | | cmGetFilenameComponentCommand: Add more componentsTushar Maheshwari2019-01-241-0/+4
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | LAST_EXT: gets last extension from filename with multiple periods NAME_WLE: gets the name without the last extension
* | | | | | | Merge topic 'implicit-incs-upd'Brad King2019-01-2847-19/+1183
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e91627dea ParseImplicitIncludeInfo: add Fortran implicit include handling 568343767e ParseImplicitIncludeInfo: handle/add SunPro, XL, and -nostdinc test cases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2855
| * | | | | | | ParseImplicitIncludeInfo: add Fortran implicit include handlingChuck Cranor2019-01-2517-12/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently cmake is only setting CMAKE_Fortran_IMPLICIT_INCLUDE_DIRECTORIES the first time it runs (the implicit includes parser is only run when the cache variables are initially populated). It is left unset during additional runs. This behavior is both confusing and inconsistent. Modify CMakeFortranCompiler.cmake.in to preserve the value of CMAKE_Fortran_IMPLICIT_INCLUDE_DIRECTORIES so that cmake's Fortran behavior matches C and CXX (i.e. CMAKE_Fortran_IMPLICIT_INCLUDE_DIRECTORIES retains its value across runs). The implicit includes variable may not be as useful for Fortran as it is for C and CXX, but we do want cmake to be consistent in how it is handled. Adjust CMakeParseImplicitIncludeInfo to parse verbose Fortran output for Cray and XL compiler IDs (GNU and clang were already ok since they use the same verbose output format as they do with C/CXX). Allow Tests/RunCMake/ParseImplicitIncludeInfo/data/CMakeLists.txt to generate test inputs for Fortran too, and add some sample Fortran input files for the Tests/RunCMake/ParseImplicitIncludeInfo test.
| * | | | | | | ParseImplicitIncludeInfo: handle/add SunPro, XL, and -nostdinc test casesChuck Cranor2019-01-2533-13/+740
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add parser code for compiler IDs SunPro and XL. For SunPro, /usr/include appears to be hardwired in and it does not have a -nostdinc-type flag. For XL, the "xlc" and "xlC" commands determine if you are C or C++ based on input filename. So compiling x.c with "xlC" reverts to C and compiling x.cc with "xlc" upgrades to CXX. System include paths are specified by: -qc_stdinc=[path] and -qgcc_c_stdinc=[path] (for C) -qcpp_stdinc=[path] and -qgcc_cpp_stdinc=[path] (for CXX) If you specify "-qnostdinc" then the above flags are ignored. Specifying an empty path reverts the value to the default path (e.g. "-qgcc_c_stdinc=" reverts that to the default). Adjust the code to handle parsing the case where the user specifies additional compiler include flags via CMAKE_C_FLAGS/CMAKE_CXX_FLAGS. For example: "-DCMAKE_C_FLAGS=-nostdinc" ... note that gcc and clang output slightly differ when -nostdinc is specified (clang skips printing 'search starts here:' with the angle brackets, gcc always prints it). Enable sunos-{C,CXX}-SunPro test cases and add XL test cases. Also add a few -nostdinc style tests.
* | | | | | | Merge topic 'vs2019'Brad King2019-01-286-10/+2562
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 626c51f47b VS: Update for Visual Studio 2019 Preview 2 fd45cbf40e VS: Fix `/MANIFESTUAC:` link flag mapping for v142 db35e3cfd6 VS: Fix support for '/guard:cf' linker flag for v142 533f95c847 VS: Map the link `/debug` flag for v142 d2fcc6748a VS: Fix `/MANIFESTUAC:NO` link flag mapping for v142 a7973ccb53 VS: Populate `/permissive` flag table entry for v142 049410c0b6 VS: Populate `/JMC-` flag table entry for v142 43aa632f57 VS: Populate `-Qspectre-` flag table entry for v142 ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2856
| * | | | | | | VS: Update for Visual Studio 2019 Preview 2Brad King2019-01-244-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toolset is now called `v142`. Use matching flag tables. Fixes: #18834
| * | | | | | | VS: Fix `/MANIFESTUAC:` link flag mapping for v142Brad King2019-01-241-21/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the change from commit 454b47ba0b (VS: Fix MANIFESTUAC link flag map to .vcxproj elements, 2018-11-21) to the v142 flag table. Add special parsing of the flags given in `/MANIFESTUAC:"..."` in order to map them correctly to `.vcxproj` elements. Keep the old incorrect flag table entries for `uiAccess` and `level` flags for compatibility even though they do not really exist.
generated by cgit v0.12 at 2025-01-01 11:31:04 (GMT)