summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2018-08-031-1/+1
|
* CMake Nightly Date StampKitware Robot2018-08-021-1/+1
|
* Merge branch 'release-3.12'Brad King2018-08-010-0/+0
|\
| * Merge branch 'UseSWIG-legacy-user-flags' into release-3.12Brad King2018-07-311-3/+4
| |\ | | | | | | | | | Merge-request: !2245
* | \ Merge topic 'UseSWIG-legacy-user-flags'Brad King2018-08-011-3/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 2f88c177d0 UseSWIG: restore legacy behavior for SWIG_MODULE_<name>_EXTRA_FLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Julien Schueller <schueller@phimeca.com> Merge-request: !2245
| * | UseSWIG: restore legacy behavior for SWIG_MODULE_<name>_EXTRA_FLAGSMarc Chevrier2018-07-311-3/+4
| |/ | | | | | | Fixes: #18226
* | Merge topic 'gcc-8-warnings'Brad King2018-08-0115-885/+913
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 276d3c7afe IWYU: Add workaround mapping for std::hash 72f57845d3 cmXMLParser: Avoid -Wconversion warning 34257b0dd4 LexerParser: Suppress GCC -Wconversion warnings cfa6b14f9c cmGlobalGenerator: Avoid -Wstringop-truncation warning 9df0e1f98a cmCommandArgumentParserHelper: Avoid -Wstringop-truncation warning b6d116e240 cmCursesLongMessageForm: Avoid -Wstringop-overflow warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2244
| * | IWYU: Add workaround mapping for std::hashBrad King2018-07-312-0/+4
| | | | | | | | | | | | | | | When using GCC 8's standard library IWYU thinks that `<system_error>` must be included to get `std::hash`. Add a mapping for `<utility>`.
| * | cmXMLParser: Avoid -Wconversion warningBrad King2018-07-311-2/+2
| | | | | | | | | | | | | | | Add an explicit cast since we expect the conversion to be well within range.
| * | LexerParser: Suppress GCC -Wconversion warningsBrad King2018-07-319-880/+904
| | | | | | | | | | | | | | | GCC 8 warns about some of the conversions in bison-generated code. Suppress the warnings.
| * | cmGlobalGenerator: Avoid -Wstringop-truncation warningBrad King2018-07-311-1/+1
| | | | | | | | | | | | | | | Use `memcpy` instead of `strncpy` to copy bytes into a buffer that is not intended to be null terminated.
| * | cmCommandArgumentParserHelper: Avoid -Wstringop-truncation warningBrad King2018-07-311-1/+1
| | | | | | | | | | | | | | | Use `memcpy` instead of `strncpy` to copy bytes from a buffer that may not be null terminated.
| * | cmCursesLongMessageForm: Avoid -Wstringop-overflow warningBrad King2018-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We use `strncpy` to copy the title up to a maximum number of characters. GCC 8's `-Wstringop-overflow` warns that the length depends on the input length because it fails to recognize that we are bounding it to the buffer size too. Update the code to hide the dependence on the input length.
* | | CMake Nightly Date StampKitware Robot2018-08-011-1/+1
|/ /
* | Merge topic 'autogen_refactor_initialization'Brad King2018-07-3110-704/+955
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bb70054e4 Autogen: Add test for Q_OS_ macros f345135845 Autogen: For Qt5 pass all implicit include directories to moc 2d6cfe2677 Autogen: Split initializer main method 84bdae8895 Autogen: Compute variables in Init stage instead of Setup stage 8e0d70272d Autogen: Move info file write code into methods 5776639fbf Autogen: Pass absolute include path in info file 2e9199b291 cmLocalGenerator: Respect user requested implicit include directories order Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2230
| * | Autogen: Add test for Q_OS_ macrosSebastian Holtermann2018-07-305-0/+180
| | |
| * | Autogen: For Qt5 pass all implicit include directories to mocSebastian Holtermann2018-07-301-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Qt4 it was not possible to pass all compiler implicit include directories to moc because it couldn't handle some system headers. For reference see commit 753b905ec86ffe369d4f59a7a8ced5fedc42939f, commit d2536579d51e77827b8e55f39123316324314781 and [QTBUG-28045](https://bugreports.qt.io/browse/QTBUG-28045). For Qt5's moc the problem does not persist anymore so we can (and should) pass all implicit include directories to moc. Fixes #18041
| * | Autogen: Split initializer main methodSebastian Holtermann2018-07-302-547/+578
| | |
| * | Autogen: Compute variables in Init stage instead of Setup stageSebastian Holtermann2018-07-302-162/+179
| | |
| * | Autogen: Move info file write code into methodsSebastian Holtermann2018-07-302-174/+198
| | |
| * | Autogen: Pass absolute include path in info fileSebastian Holtermann2018-07-304-30/+28
| | |
| * | cmLocalGenerator: Respect user requested implicit include directories orderSebastian Holtermann2018-07-301-8/+7
| | | | | | | | | | | | | | | | | | | | | In ``cmLocalGenerator::GetIncludeDirectories`` append the user requested implicit include directories first, then append the remaining implicit include directories. By By doing so we keep the user requested order of implicit include directories.
* | | CMake Nightly Date StampKitware Robot2018-07-311-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2018-07-301-1/+1
| |
* | Merge branch 'release-3.12'Craig Scott2018-07-290-0/+0
|\ \ | |/
| * Merge branch 'cpack-default-package-version-zero' into release-3.12Craig Scott2018-07-298-12/+39
| |\ | | | | | | | | | Merge-request: !2239
* | \ Merge topic 'cpack-default-package-version-zero'Craig Scott2018-07-298-12/+39
|\ \ \ | | |/ | |/| | | | | | | | | | | | | ed015bde2b CPack: Restore support for 0-valued version components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2239
| * | CPack: Restore support for 0-valued version componentsBrad King2018-07-278-12/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.12.0-rc1~136^2 (CPack: Use project version as default for `CPACK_PACKAGE_VERSION`, 2018-04-29) we did not account for the value of `CMAKE_PROJECT_VERSION_{MAJOR,MINOR,PATCH}` having `0`. Fix the logic to distinguish between unprovided version components and `0` components. While at it, add a test case covering the behavior described in the documentation by the original commit. The number of version components in the package name should match those provided to the `project()` command `VERSION` option. Fixes: #18199
* | | CMake Nightly Date StampKitware Robot2018-07-291-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2018-07-281-1/+1
| | |
* | | Merge topic 'UseSWIG-target-name-policy'Brad King2018-07-2725-28/+107
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a3a0c3aa71 UseSWIG: add policy to manage target naming strategy. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2232
| * | | UseSWIG: add policy to manage target naming strategy.Marc Chevrier2018-07-2525-28/+107
| | | |
* | | | Merge topic 'reproducible-tarballs'Brad King2018-07-279-4/+112
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 548ac51d8e CPack/Deb: Support SOURCE_DATE_EPOCH when packaging files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2226
| * | | | CPack/Deb: Support SOURCE_DATE_EPOCH when packaging filesAndrew Fuller2018-07-259-4/+112
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-07-271-1/+1
| | | | |
* | | | | Merge topic 'maint_clarify_merge_process'Brad King2018-07-261-3/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6161a64a52 maint: Add further details about merging topics to release branch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2238
| * | | | | maint: Add further details about merging topics to release branchCraig Scott2018-07-251-3/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Maintain Current Release instructions previously assumed that the topic branch had been merged to master. Add text to make this explicit in the instructions as an initial verification step. The previous instructions also made no mention of the commit message for the merge to the release branch. This needs to include a footer that mentions the merge request number for tracking purposes.
* | | | | Merge topic 'get_include_directories'Brad King2018-07-262-67/+85
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0b820ea39 cmLocalGenerator: Extend the functionality of ``GetIncludeDirectories()`` 1f36652ef4 cmLocalGenerator: Style changes: Private local variable renames db866d05de cmLocalGenerator: Style change: Wrap temporary strings and code in braces 3713dc9b8e cmLocalGenerator: Style change: Wrap temporary strings and code in braces d1077c1ce6 cmLocalGenerator: Style change: Use return value of std::set::insert Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2234
| * | | | | cmLocalGenerator: Extend the functionality of ``GetIncludeDirectories()``Sebastian Holtermann2018-07-252-11/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What ``cmLocalGenerator::GetIncludeDirectories`` does ----------------------------------------------------- In general it concatenates the 1. ``target->GetIncludeDirectories(LANG)`` and the 2. ``CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES``. Additionally it performs some sorting and special treatment of the - ``CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES``. By default all ``CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`` are stripped from the result list. When explicitly requested (by setting ``stripImplicitInclDirs=false``) *some* implicit directories are appended to the result list. The implicit directories that *are* appended are those that were requested to be included by 1. ``target->GetIncludeDirectories(LANG)`` or 2. ``CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES``. All other implicit directories are still stripped from the result list. The reason to not simply append all implicit directories is that Qt4's moc has problems to parse some headers that might be found in the implicit system include directories (See commit d2536579d51e77827b8e55f39123316324314781 and [QTBUG-28045](https://bugreports.qt.io/browse/QTBUG-28045) ). That has been solved in Qt5's moc though. Extension request to ``cmLocalGenerator::GetIncludeDirectories`` ---------------------------------------------------------------- For Qt5's moc we like to have an option that allows to append *all* implict include directories to the result list, not just those that were user requested. Changes to ``cmLocalGenerator::GetIncludeDirectories`` ------------------------------------------------------ - Shorten the function parameter name ``stripImplicitInclDirs`` to ``stripImplicitDirs``. - Add new boolean function parameter ``appendAllImplicitDirs`` with a default value ``false``. The old default behavior of the function stays the same, but a specialized behavior can be requested by AUTOMOC for Qt4/Qt5 respectively.
| * | | | | cmLocalGenerator: Style changes: Private local variable renamesSebastian Holtermann2018-07-251-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code style change in ``cmLocalGenerator::GetIncludeDirectories``. Rename a variable to reflect its purpose a little bit better.
| * | | | | cmLocalGenerator: Style change: Wrap temporary strings and code in bracesSebastian Holtermann2018-07-251-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code style change in ``cmLocalGenerator::GetIncludeDirectories``. Embrace ``{}`` temporary strings and code that uses them to minimize their lifetime.
| * | | | | cmLocalGenerator: Style change: Wrap temporary strings and code in bracesSebastian Holtermann2018-07-251-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code style change in ``cmLocalGenerator::GetIncludeDirectories``. Embrace ``{}`` temporary strings and code that uses them to minimize their lifetime.
| * | | | | cmLocalGenerator: Style change: Use return value of std::set::insertSebastian Holtermann2018-07-251-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code style change in ``cmLocalGenerator::GetIncludeDirectories()``. Use the return value of ``std::set::insert`` instead of testing if the entry already exists in the set using ``std::find``.
* | | | | | Merge branch 'release-3.12'Brad King2018-07-260-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'googletest_policy_settings' into release-3.12Brad King2018-07-251-0/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2237
* | \ \ \ \ \ Merge topic 'googletest_policy_settings'Brad King2018-07-261-0/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ddc2a110c GoogleTest: Ensure policy settings allow use of IN_LIST Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2237
| * | | | | | GoogleTest: Ensure policy settings allow use of IN_LISTCraig Scott2018-07-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If policy settings at the time the GoogleTest module is included are such that CMP0057 is unset or set to OLD, the use of IN_LIST with if() will lead to an error. Therefore, explicitly specify the policy settings for the whole file to ensure the function implementations have access to the required CMake features. Fixes: #18198
* | | | | | | CMake Nightly Date StampKitware Robot2018-07-261-1/+1
| | | | | | |
* | | | | | | Merge topic 'GetPrerequisites-dylibsframeworks'Brad King2018-07-251-14/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dce77d9ad9 GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundle Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2229
| * | | | | | GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundleHarry Mallon2018-07-241-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16828
generated by cgit v0.12 at 2025-01-06 10:01:23 (GMT)