Commit Graph

24420 Commits

Author SHA1 Message Date
Kitware Robot 3551aede35 CMake Nightly Date Stamp 2018-04-12 00:01:03 -04:00
Brad King ded33659b1 Merge topic 'cpack-trace-nullptr'
6f2701abf6 CPack: Fix crash on invalid generator name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1950
2018-04-11 10:33:48 -04:00
Kitware Robot bb1d1f160f CMake Nightly Date Stamp 2018-04-11 00:01:04 -04:00
Brad King 6f2701abf6 CPack: Fix crash on invalid generator name
In commit v3.11.0-rc1~68^2 (CPack: accept --trace and --trace-expand,
2017-12-09) a nullptr dereference was added that occurs when
`cpack -G NotAGenerator` is invoked.  Add the needed condition.

Fixes: #17900
2018-04-10 15:00:37 -04:00
Brad King 5c10e8f608 Merge topic 'fix-crash-trace-exp-uninit-vars'
aad360eb3d Fix crash with --trace-expand --warn-uninitialized together

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1944
2018-04-10 11:32:56 -04:00
Kitware Robot e769e61f99 CMake Nightly Date Stamp 2018-04-10 00:01:06 -04:00
R2RT aad360eb3d Fix crash with --trace-expand --warn-uninitialized together
Some code paths in `ExpandVariablesInString{New,Old}` were not checking
the `filename` parameter for a null pointer, but this can happen when
using the above flags together.  Add the checks and a test case.

Fixes: #17896
2018-04-09 11:59:07 -04:00
Kitware Robot 13f19f7472 CMake Nightly Date Stamp 2018-04-09 00:01:03 -04:00
Kitware Robot 843bd8e91b CMake Nightly Date Stamp 2018-04-08 00:01:04 -04:00
Kitware Robot 9576863d18 CMake Nightly Date Stamp 2018-04-07 00:01:07 -04:00
Brad King 576d01fed4 Merge topic 'ninja-fortran-rspfile'
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
2018-04-06 10:30:40 -04:00
Brad King 607b0ac2f3 Merge topic 'minor-cleanups'
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
2018-04-06 10:29:38 -04:00
Brad King 5454b41e1b Merge topic 'sanitize-LINK_DIRECTORIES'
0ad329f7c0 Sanitize paths from LINK_DIRECTORIES directory property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1920
2018-04-06 10:26:47 -04:00
Brad King 58e847c49a Merge topic 'xml-level'
050ddfb3f3 cmXMLWriter: code improvement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1925
2018-04-06 10:25:46 -04:00
Brad King d308e9442e Merge topic 'glob_configure_depends'
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
2018-04-06 10:25:08 -04:00
Kitware Robot 2e49bb6434 CMake Nightly Date Stamp 2018-04-06 00:01:03 -04:00
jrp2014 acda926a04 Replace some uses of sprintf with std::to_string 2018-04-05 15:34:23 -04:00
jrp2014 418541035f cmCTestCurl: Fix UploadFile declared parameter names
Match the order used in the definition.
2018-04-05 13:42:49 -04:00
jrp2014 1519628e60 cmVisualStudio10TargetGenerator: Make NsightTegraVersion unsigned
It's used in unsigned contexts, such as with format strings.
2018-04-05 13:42:49 -04:00
jrp2014 2f87d00803 cmMacroCommand: Fix format string to match type of argument 2018-04-05 13:42:49 -04:00
jrp2014 b0676cc5d4 Add in-class initialization of some members
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.
2018-04-05 13:42:48 -04:00
jrp2014 966dba5b68 cmAlgorithms: Remove unnecessary typename keyword 2018-04-05 13:42:48 -04:00
Brad King 57c2834da0 Merge topic 'vs10-groups'
30bbb4f2ac cmVisualStudio10TargetGenerator: extend DOM-like generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1905
2018-04-05 13:27:39 -04:00
Brad King d6390ce26e Ninja: Fix Fortran support with response files
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
2018-04-05 13:02:27 -04:00
Brad King 8592c6326b cmNinjaTargetGenerator: Move force-rspfile check to earlier 2018-04-05 12:51:21 -04:00
Brad King e0aa060352 cmNinjaTargetGenerator: Move depfile logic to later in its function
Clarify that other compile rule generation logic does not depend on it.
2018-04-05 12:50:57 -04:00
Kitware Robot aae2bcf8dd CMake Nightly Date Stamp 2018-04-05 00:01:04 -04:00
jrp2014 0ad329f7c0 Sanitize paths from LINK_DIRECTORIES directory property
Normally they are sanitized by the `link_directories` command before
populating the property, but projects may set the property directly.
2018-04-04 14:42:20 -04:00
Brad King 49ea1bb243 Merge topic 'autogen-protect-cmsys-calls'
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
2018-04-04 11:21:54 -04:00
Brad King 640bc9def4 Merge topic 'cuda_support_system_libraries_with_device_symbols'
41eab150a8 CUDA: Pass more link libraries to device linking
88c7abb740 CUDA: Pass host linker directories to device linker

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1634
2018-04-04 11:12:52 -04:00
Kitware Robot c468b9a231 CMake Nightly Date Stamp 2018-04-04 00:01:03 -04:00
Vitaly Stakhovsky 050ddfb3f3 cmXMLWriter: code improvement
New Indent member will be used for XML indentation
2018-04-03 17:28:08 -04:00
Sebastian Holtermann b11e2c80b1 Autogen: Print moc/uic/rcc output to stdout
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
2018-04-03 17:20:30 +02:00
Sebastian Holtermann 1d2c9d8c6d Autogen: Use std::istreambuf_iterator for file so string reading
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.
2018-04-03 17:20:30 +02:00
Sebastian Holtermann ccc38fa509 Autogen: Protected calls to cmFilePathChecksum
Closes #17861
Closes #17862
2018-04-03 17:20:30 +02:00
Sebastian Holtermann 719b24c872 Autogen: Protected calls to cmQtAutoGen::SubDirPrefix 2018-04-03 17:20:30 +02:00
Sebastian Holtermann 9a73615815 Autogen: Protected calls to cmSystemTools::GetFilenameWithoutLastExtension 2018-04-03 17:20:30 +02:00
Sebastian Holtermann 65203ce407 Autogen: Protected calls to cmSystemTools::Split/JoinPath 2018-04-03 17:20:30 +02:00
Sebastian Holtermann 14a86c9ea7 Autogen: Protected calls to cmSystemTools::CollapseCombinedPath 2018-04-03 17:20:29 +02:00
Kitware Robot e3ce4d7a28 CMake Nightly Date Stamp 2018-04-03 00:01:07 -04:00
Brad King e42fcb117f Merge topic 'remove-vs8-generator'
eb80af9093 Drop Visual Studio 8 2005 generator
e7af91d026 Tests: Remove unused file from Tutorial Step7 test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1901
2018-04-02 10:09:15 -04:00
Brad King eb80af9093 Drop Visual Studio 8 2005 generator
This generator has been deprecated since CMake 3.9.  Remove it.
2018-04-02 10:08:10 -04:00
Brad King a76e23eabb Merge topic 'variable-CMAKE_FOLDER'
df535ad846 Add CMAKE_FOLDER variable to initialize FOLDER target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1896
2018-04-02 10:06:39 -04:00
Brad King 8f5b6962c9 Merge topic 'update-kwsys'
4c90e94368 Merge branch 'upstream-KWSys' into update-kwsys
b66f18c84f KWSys 2018-03-29 (488f2031)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1902
2018-04-02 10:03:12 -04:00
Brad King 1b6ec4b9e3 Merge topic 'features-c++20'
8570dc7f64 Help: Update compiler versions in cmake-compile-features.7.rst
874d3d2948 Help: Add release note for C++ 20 support
7f295b1bd3 Features: Activate C++ 20 support for Clang 5.0+
71cb8ce3a1 Features: Activate C++ 20 support for GNU 8.0+
8f146c4508 Features: Activate C++ 20 support for MSVC 19.12.25835+
7fe580a362 Features: Add infrastructure for C++ 20 language standard
1b328e09a3 Features: Use -std=c++17 for C++ 17 on Clang 5.0+
0bc3e5788a Features: Use -std=c++17 for C++ 17 on GNU 8.0+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1892
2018-04-02 10:01:23 -04:00
Kitware Robot a0b5dade9a CMake Nightly Date Stamp 2018-04-02 00:01:04 -04:00
Shane Parris 3f4b81f540 Add glob verify support to XCode, VS, Ninja, and Makefile generators 2018-04-01 23:16:12 -04:00
Kitware Robot 323d6b4c75 CMake Nightly Date Stamp 2018-04-01 00:01:07 -04:00
Kitware Robot 1d5ad1fdee CMake Nightly Date Stamp 2018-03-31 00:01:09 -04:00
Vitaly Stakhovsky 30bbb4f2ac cmVisualStudio10TargetGenerator: extend DOM-like generation
The local Elem class is extended with more XML-generating functions.
WriteGroups() is rewritten to use these new functions,
avoiding BuildFileStream.
2018-03-30 22:55:30 -04:00