summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'UseSWIG-bugfixes'Craig Scott2018-04-069-41/+45
|\ | | | | | | | | | | | | 38dcdd7641 UseSWIG: Ensure tests are usable in multi-config mode. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1934
| * UseSWIG: Ensure tests are usable in multi-config mode.Marc Chevrier2018-04-059-41/+45
| | | | | | | | Fixes: #17875
* | Merge topic 'ninja-fortran-rspfile'Brad King2018-04-066-69/+104
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | d6390ce26e Ninja: Fix Fortran support with response files 8592c6326b cmNinjaTargetGenerator: Move force-rspfile check to earlier e0aa060352 cmNinjaTargetGenerator: Move depfile logic to later in its function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1936
| * | Ninja: Fix Fortran support with response filesBrad King2018-04-056-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator splits preprocessing and compilation steps for Fortran. Fix this logic to work when using response files for compilation so that it works for the preprocessing step too. This fixes behavior under `CMAKE_NINJA_FORCE_RESPONSE_FILE`. Issue: #17877
| * | cmNinjaTargetGenerator: Move force-rspfile check to earlierBrad King2018-04-051-4/+5
| | |
| * | cmNinjaTargetGenerator: Move depfile logic to later in its functionBrad King2018-04-051-47/+49
| | | | | | | | | | | | Clarify that other compile rule generation logic does not depend on it.
* | | Merge topic 'minor-cleanups'Brad King2018-04-0615-35/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acda926a04 Replace some uses of sprintf with std::to_string 418541035f cmCTestCurl: Fix UploadFile declared parameter names 1519628e60 cmVisualStudio10TargetGenerator: Make NsightTegraVersion unsigned 2f87d00803 cmMacroCommand: Fix format string to match type of argument b0676cc5d4 Add in-class initialization of some members 966dba5b68 cmAlgorithms: Remove unnecessary typename keyword 12a145534a gitignore: Ignore a .vs directory in the source tree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1932
| * | | Replace some uses of sprintf with std::to_stringjrp20142018-04-052-19/+18
| | | |
| * | | cmCTestCurl: Fix UploadFile declared parameter namesjrp20142018-04-051-1/+1
| | | | | | | | | | | | | | | | Match the order used in the definition.
| * | | cmVisualStudio10TargetGenerator: Make NsightTegraVersion unsignedjrp20142018-04-052-3/+3
| | | | | | | | | | | | | | | | It's used in unsigned contexts, such as with format strings.
| * | | cmMacroCommand: Fix format string to match type of argumentjrp20142018-04-051-1/+1
| | | |
| * | | Add in-class initialization of some membersjrp20142018-04-057-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Several class constructors leave members uninitialized. The members are initialized before use in methods, but it is clearer and less error-prone to initialize them at their definition site.
| * | | cmAlgorithms: Remove unnecessary typename keywordjrp20142018-04-051-1/+1
| | | |
| * | | gitignore: Ignore a .vs directory in the source treejrp20142018-04-051-0/+3
| | |/ | |/|
* | | Merge topic 'sanitize-LINK_DIRECTORIES'Brad King2018-04-061-6/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0ad329f7c0 Sanitize paths from LINK_DIRECTORIES directory property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1920
| * | | Sanitize paths from LINK_DIRECTORIES directory propertyjrp20142018-04-041-6/+4
| | | | | | | | | | | | | | | | | | | | Normally they are sanitized by the `link_directories` command before populating the property, but projects may set the property directly.
* | | | Merge topic 'xml-level'Brad King2018-04-062-14/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 050ddfb3f3 cmXMLWriter: code improvement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1925
| * | | | cmXMLWriter: code improvementVitaly Stakhovsky2018-04-032-14/+18
| |/ / / | | | | | | | | | | | | New Indent member will be used for XML indentation
* | | | Merge topic 'glob_configure_depends'Brad King2018-04-0638-56/+793
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c4f8b4596 Adjust help documentation for file(GLOB), add topic notes 20612978c8 Add tests for `file(GLOB)` CONFIGURE_DEPENDS flag 3f4b81f540 Add glob verify support to XCode, VS, Ninja, and Makefile generators ca0befc2e1 Add `CONFIGURE_DEPENDS` flag support to cmFileCommand::HandleGlobCommand 599c93e22d Add cmGlobVerificationManager class, integrate with cmake and cmState Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1767
| * | | | Adjust help documentation for file(GLOB), add topic notesShane Parris2018-04-022-2/+17
| | | | |
| * | | | Add tests for `file(GLOB)` CONFIGURE_DEPENDS flagShane Parris2018-04-0219-0/+159
| | | | |
| * | | | Add glob verify support to XCode, VS, Ninja, and Makefile generatorsShane Parris2018-04-029-54/+227
| | | | |
| * | | | Add `CONFIGURE_DEPENDS` flag support to cmFileCommand::HandleGlobCommandShane Parris2018-03-291-0/+38
| | | | |
| * | | | Add cmGlobVerificationManager class, integrate with cmake and cmStateShane Parris2018-03-298-0/+352
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-04-061-1/+1
| | | | |
* | | | | Merge topic 'findwxwidgets-msys-library-dirs'Brad King2018-04-051-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44ad8e48de FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1930
| * | | | | FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYSARATA Mizuki2018-04-041-0/+20
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for `wxWidgets_LIBRARIES` variable, introduced by e8b77084, fails with the `wx-config` script generated by an MSYS build, because `wxWidgets_LIBRARY_DIRS` is in POSIX style. This commit fixes the problem with `wxWidgets_LIBRARY_DIRS` by converting it to Windows style. The actual code were copied from bf643286, which does the same thing for `wxWidgets_INCLUDE_DIRS`.
* | | | | Merge topic 'vs10-groups'Brad King2018-04-052-79/+102
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30bbb4f2ac cmVisualStudio10TargetGenerator: extend DOM-like generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1905
| * | | | | cmVisualStudio10TargetGenerator: extend DOM-like generationVitaly Stakhovsky2018-03-312-79/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The local Elem class is extended with more XML-generating functions. WriteGroups() is rewritten to use these new functions, avoiding BuildFileStream.
* | | | | | Merge topic 'msvc-toolset-version-variable'Brad King2018-04-0510-135/+103
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45bf6f6246 Modules: Use MSVC_TOOLSET_VERSION variable to simplify logic 304f493e57 MSVC: Add MSVC_TOOLSET_VERSION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1882
| * | | | | | Modules: Use MSVC_TOOLSET_VERSION variable to simplify logicArkady Shapkin2018-04-045-134/+48
| | | | | | |
| * | | | | | MSVC: Add MSVC_TOOLSET_VERSION variableArkady Shapkin2018-04-045-1/+55
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the MSVC toolset version number based on the compiler version. Fixes: #16923
* | | | | | Merge branch 'release-3.11'Brad King2018-04-050-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'revert-CheckIncludeFile-required-libs' into release-3.11Brad King2018-04-044-18/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1931
* | \ \ \ \ \ \ Merge topic 'revert-CheckIncludeFile-required-libs'Brad King2018-04-054-18/+16
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | 35109e718b Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1931
| * | | | | | Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES"Brad King2018-04-044-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit v3.11.0-rc1~108^2 (CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES, 2017-12-24). The behavior change can affect checks in existing projects that don't expect the behavior. Introducing the behavior again will require a policy. Fixes: #17874 Issue: #9514
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-051-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'release-3.11'Brad King2018-04-040-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'autogen-protect-cmsys-calls' into release-3.11Brad King2018-04-045-48/+163
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Merge-request: !1918
* | | | | | Merge topic 'autogen-protect-cmsys-calls'Brad King2018-04-045-48/+163
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b11e2c80b1 Autogen: Print moc/uic/rcc output to stdout 1d2c9d8c6d Autogen: Use std::istreambuf_iterator for file so string reading ccc38fa509 Autogen: Protected calls to cmFilePathChecksum 719b24c872 Autogen: Protected calls to cmQtAutoGen::SubDirPrefix 9a73615815 Autogen: Protected calls to cmSystemTools::GetFilenameWithoutLastExtension 65203ce407 Autogen: Protected calls to cmSystemTools::Split/JoinPath 14a86c9ea7 Autogen: Protected calls to cmSystemTools::CollapseCombinedPath Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1918
| * | | | | Autogen: Print moc/uic/rcc output to stdoutSebastian Holtermann2018-04-032-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output of moc/uic/rcc used to be discarded unless the program failed. This lets moc/uic/rcc print their output to stdout even on success. Closes #17860
| * | | | | Autogen: Use std::istreambuf_iterator for file so string readingSebastian Holtermann2018-04-032-20/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a dedicated mutex for file reading and writing to cmQtAutoGenerator::FileSystem. The purpose of the change is to avoid that long files reads block cmsys based path computations, which are protected by an other mutex.
| * | | | | Autogen: Protected calls to cmFilePathChecksumSebastian Holtermann2018-04-034-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17861 Closes #17862
| * | | | | Autogen: Protected calls to cmQtAutoGen::SubDirPrefixSebastian Holtermann2018-04-033-5/+14
| | | | | |
| * | | | | Autogen: Protected calls to cmSystemTools::GetFilenameWithoutLastExtensionSebastian Holtermann2018-04-033-5/+14
| | | | | |
| * | | | | Autogen: Protected calls to cmSystemTools::Split/JoinPathSebastian Holtermann2018-04-033-2/+33
| | | | | |
| * | | | | Autogen: Protected calls to cmSystemTools::CollapseCombinedPathSebastian Holtermann2018-04-033-7/+24
| |/ / / /
* | | | | Merge topic 'wcdh-bare-features'Brad King2018-04-045-34/+127
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f38d050231 WCDH: introduce BARE_FEATURES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1869
| * | | | | WCDH: introduce BARE_FEATURESRolf Eike Beer2018-04-035-34/+127
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This allows defining compat versions of some C/C++ features with the name of the keyword itself, so all code can look as if it was written for the new language standard.
* | | | | Merge topic 'android-no-libstdc++'Brad King2018-04-0411-0/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 843d55de29 Android: Suppress implicit -lstdc++ linker flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1919
generated by cgit v0.12 at 2025-02-01 01:54:18 (GMT)